diff -Nru colord-1.2.12/aclocal.m4 colord-1.3.2/aclocal.m4 --- colord-1.2.12/aclocal.m4 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/aclocal.m4 2016-02-17 13:32:55.000000000 +0000 @@ -20,187 +20,6 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl - -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi - - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas - -mostlyclean-am: clean-gsettings-schemas - -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) - -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ - -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas - -.SECONDARY: $(gsettings_SCHEMAS) - -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi - -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) - -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - dnl Canonicalize enable_introspection - enable_introspection=$found_introspection - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # @@ -416,6 +235,187 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) + # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru colord-1.2.12/ChangeLog colord-1.3.2/ChangeLog --- colord-1.2.12/ChangeLog 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/ChangeLog 2016-03-21 11:48:32.000000000 +0000 @@ -1,6 +1,967 @@ +commit 6949c2a1a62cd44e7e6c25e6db4a5a88d6ab5efd +Merge: d9c9255 8e27af8 +Author: Richard Hughes +Date: 2016-03-21 + + Merge pull request #22 from canek-pelaez/master + + session-helper: Replace '/' with '-' on the basename so creating + the profile file doesn't fail. + +commit 8e27af8feeea71ed79c06c46a28b0e445cef46cb +Author: Canek Peláez Valdés +Date: 2016-03-20 + + session-helper: Replace '/' with '-' on the basename so creating the + profile file doesn't fail. + +M contrib/session-helper/cd-main.c + +commit d9c92556523a5732c70da1bfa16435916916fecd +Author: Richard Hughes +Date: 2016-03-16 + + libcolord: Fix a hard-to-reproduce bug when cancelling async + operations + +M lib/colord/cd-client.c +M lib/colord/cd-device.c +M lib/colord/cd-profile.c +M lib/colord/cd-sensor.c + +commit 1297fa7bac138867a19f615d6cef0e485ec91bd1 +Author: Richard Hughes +Date: 2016-03-03 + + trivial: Fix FALSE/NULL confusion spotted with GCC6 + +M contrib/session-helper/cd-main.c +M lib/colord/cd-client.c +M lib/colord/cd-device.c +M lib/colord/cd-icc.c +M lib/colord/cd-it8.c +M lib/colord/cd-sensor.c +M lib/colorhug/ch-device.c +M lib/huey/huey-ctx.c +M lib/ospark/osp-device.c +M src/cd-main.c +M src/sensors/cd-sensor-argyll.c +M src/sensors/cd-sensor-colorhug.c +M src/sensors/cd-sensor-dtp94.c +M src/sensors/cd-sensor-dummy.c +M src/sensors/cd-sensor-huey.c +M src/sensors/cd-sensor-munki.c +M src/sensors/cd-sensor-spark.c + +commit 7078cc21da3cc8f1217bb6099e95bb4ad4edd113 +Author: Richard Hughes +Date: 2015-11-27 + + libcolorhug: Add initial support for the v2 protocol used by ColorHug+ + +M lib/colorhug/ch-common.c +M lib/colorhug/ch-common.h +M lib/colorhug/ch-device.c +M lib/colorhug/ch-device.h + +commit 004e5a14f6a3f0dcd2d2f1626eadddd5532a7791 +Author: Richard Hughes +Date: 2016-02-17 + + Make building the daemon optional + +M Makefile.am +M client/Makefile.am +M configure.ac +M data/Makefile.am + +commit 8610050eb1993a5172014975937dfa2acfa596ff +Author: Richard Hughes +Date: 2016-02-17 + + trivial: Fix compile with --disable-polkit + +M src/cd-common.c + +commit b51ef5c91e59370aa91b0b60f951d7fd20b0abfb +Author: Richard Hughes +Date: 2016-02-17 + + Make the session helper optional + +M configure.ac +M contrib/Makefile.am + +commit 91c432ad8891dbe730251825193f8ded995a0fa3 +Author: Richard Hughes +Date: 2016-01-06 + + trivial: Fix trivial whitespace issue + +M lib/colorhug/ch-device.c + +commit 1bd54ee3d6c8e7c3c7213749adc18a55e8fd370b +Author: Richard Hughes +Date: 2016-01-06 + + trivial: Fix tiny gtk-doc issue + +M lib/colord/cd-spectrum.h + +commit fbd01a0a5c0e6522494772d9828e542eb5549013 +Author: Richard Hughes +Date: 2016-01-04 + + libcolorhug: Fix a crash when submitting lots of commands at the + same time + + This is some sort of race; leaving the data objects in memory + until the + ChDeviceQueue is unref'd is only a tiny amount of space and so + much better + than a crash. + +M lib/colorhug/ch-device-queue.c + +commit 6fee10f3dc701f3f0625fdf21e3e5756e1c5d4b5 +Author: Richard Hughes +Date: 2016-01-04 + + trivial: Remove an assert that triggers a valgrind warning + +M lib/colord/cd-sensor.c + +commit 9749dbc2032c0ac04c64915bd1f583efba15fc7a +Author: Richard Hughes +Date: 2015-11-27 + + trivial: post release version bump + +M RELEASE +M configure.ac + +commit f25cb7b0ef73b20810dc34f6741890c3f61b030d +Author: Richard Hughes +Date: 2015-11-27 + + Release colord 1.3.1 + +M NEWS +M RELEASE +M configure.ac +M doc/website/download.html +M po/cs.po +M po/da.po +M po/de.po +M po/el.po +M po/en_GB.po +M po/es.po +M po/eu.po +M po/fi.po +M po/fr.po +M po/gl.po +M po/he.po +M po/hu.po +M po/id.po +M po/it.po +M po/ja.po +M po/ko.po +M po/lv.po +M po/nb.po +C096 po/nb.po po/nb_NO.po +M po/nl.po +M po/pl.po +M po/pt_BR.po +M po/pt_PT.po +M po/ro.po +M po/ru.po +M po/sk.po +M po/sl.po +M po/sr.po +M po/sv.po +M po/tr.po +M po/uk.po +M po/zh_CN.po +M po/zh_TW.po + +commit e58bdfef1328eecdd95256b37cb0a7f720dd9f64 +Author: Richard Hughes +Date: 2015-11-16 + + Ignore the ColorHug+ in DFU mode + +M rules/69-cd-sensors.rules.in + +commit aaf920170220c2b1f3208b7c8fa3d26a07fc021b +Author: Richard Hughes +Date: 2015-10-29 + + ospark: Do a 10us dark reading before the main reading + + The spark device does not adjust the VRef- of the ADC for dark + current, and so + we have to do this manually in software. + +M lib/ospark/osp-device.c +M src/sensors/cd-sensor-spark.c + +commit af360010b39e27dae203df55908b9afb5b63c6a1 +Author: Richard Hughes +Date: 2015-10-28 + + trivial: Add some more gtk-doc to libospark + +M lib/ospark/osp-device.c + +commit 7ba666dd87419603cb6cf3d8a2a01b42b95d249c +Author: Richard Hughes +Date: 2015-10-27 + + trivial: Fix a crash when we read from a ColorHug with no calibration + +M lib/colorhug/ch-device-queue.c +M src/sensors/cd-sensor-colorhug.c + +commit cb05574d94135c7b99527eaaed633d8898717d78 +Author: Richard Hughes +Date: 2015-10-27 + + libcolord: Add two new sensor capability enum values for calibration + + This is so we can avoid playing tricks in sensors that support more + than one + kind of calibration, for instance the Spark sensor. + +M client/cd-util.c +M lib/colord/cd-enum.c +M lib/colord/cd-enum.h +M src/cd-sensor.c +M src/sensors/cd-sensor-spark.c + +commit a81cc2c66376de784af8d32167bb39ce3d71b944 +Author: Richard Hughes +Date: 2015-10-26 + + data: Build Rec709 correctly + + Fixes https://github.com/hughsie/colord/issues/17 + +M data/profiles/Makefile.am + +commit 35937d18cfa1a172ecd74d70d96626f4d02ae9e2 +Author: Richard Hughes +Date: 2015-10-26 + + libospark: Support irradiance calibration on the Spark device + +M lib/ospark/osp-device.c +M src/sensors/cd-sensor-spark.c + +commit c6b75def8ce9d51368d12412d2a722a02ae8a9f3 +Author: Richard Hughes +Date: 2015-10-26 + + libospark: Measure the sensor response time + + This allows us to check the device integration time. + +M lib/ospark/osp-device.c + +commit 0d33f1c83f72516ae1ee746fbba993adfec8f601 +Author: Richard Hughes +Date: 2015-10-26 + + libospark: Only show protocol debugging with an env var + +M lib/ospark/osp-device.c + +commit 1563dbc3088e5cbacdb3919bc27c738232fd82af +Author: Richard Hughes +Date: 2015-10-26 + + libcolord: Add an error enum for missing irradiance calibration + +M client/cd-util.c +M lib/colord/cd-enum.c +M lib/colord/cd-enum.h + +commit 2378c8a3b0c007c0767572dfe79bb64a567bf449 +Author: Richard Hughes +Date: 2015-10-26 + + libcolord: Modify cd_spectrum_subtract() to include a resolution value + + This allows us to resample the spectra in case they have differing + start, end, + or source resolutions. + +M lib/colord/cd-spectrum.c +M lib/colord/cd-spectrum.h +M lib/colord/cd-test-private.c +M src/sensors/cd-sensor-spark.c + +commit 965408aa8ed6721b883ffad0f4ca8b23825b86fc +Author: Richard Hughes +Date: 2015-10-26 + + libcolord: Add cd_spectrum_planckian_new_full() + + This allows you to include start, end and resolution values. + +M lib/colord/cd-spectrum.c +M lib/colord/cd-spectrum.h + +commit d23289f740e2ef2625c0e0dc930abbf7e312b760 +Author: Richard Hughes +Date: 2015-10-26 + + Use the correct console size when using get-spectral-reading + +M client/cd-util.c + +commit d49b89f32422759b6cf182417ccb05146d0662cf +Author: Richard Hughes +Date: 2015-10-24 + + libospark: Add methods for getting the nonlinearity and irradiance + calibrations + + Although, disappointingly, there appears to be no stored data on + the device. + +M lib/ospark/osp-device.c +M lib/ospark/osp-device.h +M lib/ospark/osp-self-test.c + +commit 1bb5be35f41e5dbe1b6be87862525c3604ced5cf +Author: Richard Hughes +Date: 2015-10-26 + + colorhug: Fix a crash in the conversion to GTask + +M lib/colorhug/ch-device-queue.c + +commit d55ea848606838ee6eb79c7b479e70d73859673f +Author: Richard Hughes +Date: 2015-10-16 + + Add cd_spectrum_resample() + + This resamples a spectrum to a linear data scale. + +M lib/colord/cd-spectrum.c +M lib/colord/cd-spectrum.h +M lib/colord/cd-test-private.c +M src/sensors/cd-sensor-spark.c + +commit 8ac504885925b9613649ff7408579feec17aa59d +Author: Richard Hughes +Date: 2015-10-16 + + libospark: Use pixel to wavelength calibration + + This device does not have a linear relationship between pixel + position and + wavelength. + +M lib/ospark/osp-device.c +M lib/ospark/osp-device.h +M lib/ospark/osp-self-test.c + +commit 6c3a8185bb09d5cab4a1821be43c26a5a42cffe5 +Author: Richard Hughes +Date: 2015-10-16 + + libcolord: Add cd_spectrum_set_wavelength_cal() + + This allows us to have a non-linear relationship between pixel + index and + wavelength value. + +M lib/colord/cd-spectrum.c +M lib/colord/cd-spectrum.h +M lib/colord/cd-test-private.c + +commit ea20f28db7b672793012b398a219d907b3da02d9 +Author: Richard Hughes +Date: 2015-10-16 + + libcolord: Do not limit values when subtracting spectra + + Also, fix a few bugs when checking for spectra validity. + +M lib/colord/cd-spectrum.c +M lib/colord/cd-test-private.c +M src/sensors/cd-sensor-spark.c + +commit c1c8a65544904a3bf6aef8af4d61eafef2f4778c +Author: Richard Hughes +Date: 2015-10-16 + + libcolord: Add cd_spectrum_limit_min() + + This allows us to enforce a ceil() or floor() for the spectrum. + +M lib/colord/cd-spectrum.c +M lib/colord/cd-spectrum.h +M lib/colord/cd-test-private.c + +commit 070e1584ead7b339b1d36e3e6221a0fa0ac08ae1 +Author: Richard Hughes +Date: 2015-10-15 + + Allow returning spectral readings from the Spark sensor + +M src/sensors/cd-sensor-spark.c + +commit b06424f93356e5f8a847afd2987eb72326ccaecc +Author: Richard Hughes +Date: 2015-10-15 + + libcolord: Fix saving non-normalized spectra + + The conditional was the wrong way around, so add some self tests to + catch this. + +M lib/colord/cd-it8.c +M lib/colord/cd-test-private.c +M lib/colord/cd-test-shared.c +M lib/colord/cd-test-shared.h + +commit ed02a5536667b9baff98872d923aeaf1a987b1ed +Author: Richard Hughes +Date: 2015-10-15 + + libospark: Ensure we get maximum precision from the spectral sensor + + The device is limited to return values of 0x3fff per pixel, so aim + for exactly + half of that after the initial test measurement. + +M lib/ospark/osp-device.c + +commit 0ab58b405cfb0addc885f1d17e602451d8a39e1e +Author: Richard Hughes +Date: 2015-10-15 + + Add get-spectral-reading command to colormgr + + This displays a bar graph on the console of the spectrum. + +M client/cd-util.c + +commit 93e1798bef9e31d9fd9210a30ca1414a858a5b1c +Author: Richard Hughes +Date: 2015-10-15 + + libcolord: Add cd_sensor_get_spectrum() + +M lib/colord/cd-sensor-sync.c +M lib/colord/cd-sensor-sync.h +M lib/colord/cd-sensor.c +M lib/colord/cd-sensor.h + +commit d2479cf23bdd50a23030290256bbd3624bdc283c +Author: Richard Hughes +Date: 2015-10-15 + + Add the GetSpectrum() sensor D-Bus method + + This allows clients to query a spectrum from a locked sensor. + +M src/cd-sensor.c +M src/cd-sensor.h +M src/org.freedesktop.ColorManager.Sensor.xml + +commit 86952ef1f351b1a65eca750a74294fdcb8f72715 +Author: Richard Hughes +Date: 2015-10-15 + + libcolord: Add a spectral sensor capability + + The idea here is to use this for sensors that can return a full + spectrum rather + than just a XYZ value. + +M lib/colord/cd-enum.c +M lib/colord/cd-enum.h +M src/sensors/cd-sensor-spark.c + +commit 06587781dd6fc7a20fe79f24df1cfa23776debbe +Author: Richard Hughes +Date: 2015-10-15 + + libcolord: Add cd_spectrum_to_string() + +M lib/colord/cd-spectrum.c +M lib/colord/cd-spectrum.h +M lib/colord/cd-test-private.c + +commit 78ca84c488d96caa9634c1cfe201f4a6ee15b3ef +Author: Richard Hughes +Date: 2015-10-14 + + Save the Spark dark calibration to a file + +M src/sensors/cd-sensor-spark.c + +commit 3005658a8667f029890a4e02db05938602593f0a +Author: Richard Hughes +Date: 2015-10-14 + + libospark: Add osp_device_take_spectrum_full() and add autoscaling + + This allows us to return the most accurate reading possible. + +M lib/ospark/osp-device.c +M lib/ospark/osp-device.h + +commit b149c14bde4761e71c7438e372b53f83f1d02c84 +Author: Richard Hughes +Date: 2015-10-14 + + libospark: Correctly set the normalization when returning + + This was uncovered when trying to subtract a normalized dark + calibration. + +M lib/ospark/osp-device.c + +commit 2dd52eacb5bd19ff5262f4dccf76acd4b325fc72 +Author: Richard Hughes +Date: 2015-10-14 + + trivial: Fill the screen when doing the spark sensor debug + +M src/sensors/cd-sensor-spark.c + +commit 3b8d845416cd1fa6297f95bf71aefe849d5287e8 +Author: Richard Hughes +Date: 2015-10-14 + + trivial: Use the normalised value when subtracting spectra + +M lib/colord/cd-spectrum.c + +commit bdb8f32b0de4a42f9f9e11e527a8e2409c8938e2 +Author: Richard Hughes +Date: 2015-10-14 + + libcolord: Add cd_spectrum_get_value_max() + + This is useful for auto-normalizing results. + +M lib/colord/cd-spectrum.c +M lib/colord/cd-spectrum.h +M lib/colord/cd-test-private.c + +commit b8fa671e213306906c9d0ca352d9db697390637c +Author: Richard Hughes +Date: 2015-10-14 + + libcolorhug: Port to GTask + +M lib/colorhug/ch-device-queue.c +M lib/colorhug/ch-device.c + +commit 4bf389ae3d9881d4d54866c710b07d4de10456ec +Author: Richard Hughes +Date: 2015-10-14 + + libcolord: Port to GTask + +M configure.ac +M lib/colord/cd-client.c +M lib/colord/cd-device.c +M lib/colord/cd-profile.c +M lib/colord/cd-sensor.c + +commit 188bd64a23a3b3f440916b2923aeaf5b89ae25b7 +Author: Richard Hughes +Date: 2015-10-14 + + libcolord: Actually connect to the daemon during the tests + + I have no idea how this actually worked before... + +M lib/colord/cd-test-daemon.c + +commit fd7f80cc81bd6e0f3c66c1a69356dfa04ca6fed8 +Author: Richard Hughes +Date: 2015-10-14 + + libcolord: Fix a tiny memory leak in cd_icc_get_tag_data() + +M lib/colord/cd-icc.c + +commit f0f1e666716135c7ce9f54c634c55043c938b554 +Author: Richard Hughes +Date: 2015-10-13 + + Port all the sensor plugins to GTask + +M src/sensors/Makefile.am +M src/sensors/cd-sensor-argyll.c +M src/sensors/cd-sensor-colorhug.c +M src/sensors/cd-sensor-dtp94.c +M src/sensors/cd-sensor-dummy.c +M src/sensors/cd-sensor-huey.c +M src/sensors/cd-sensor-munki.c +M src/sensors/cd-sensor-spark.c + +commit d0be37876f751048aaa72dbff01971d54e498c42 +Author: Richard Hughes +Date: 2015-10-13 + + Use a D65 illuminant for the spark XYZ conversion + +M src/sensors/cd-sensor-spark.c + +commit 0142968a33bcb8efcef95d090ea87189ac9cb083 +Author: Richard Hughes +Date: 2015-10-14 + + Reset the sensor back to idle after each action + + This means the sensor drivers no longer have to do this. + +M src/cd-sensor.c + +commit 859404ae80c504db4d6a1c5991e29f0f27fecf44 +Author: Richard Hughes +Date: 2015-10-14 + + Add cd_sensor_set_state_in_idle() which is threadsafe + +M src/cd-sensor.c +M src/cd-sensor.h + +commit 3df1968e6d9ea253a443a0b96fe5bda1337c9db1 +Author: Richard Hughes +Date: 2015-10-14 + + trivial: Use g_autoptr() in more places + +M src/sensors/cd-parse-beagle.c + +commit 9cf5929cd5a7aa75ad4a80c49e3ba5f0ec8a9e63 +Author: Richard Hughes +Date: 2015-10-14 + + libospark: Don't assume the seral number buffer is NUL terminated + +M lib/ospark/osp-device.c + +commit deda671ec979571fee329caf2148554a40d6acd7 +Author: Richard Hughes +Date: 2015-10-13 + + trivial: Remove the *unused* sensor headers + +M src/sensors/Makefile.am +D src/sensors/cd-sensor-argyll.h +D src/sensors/cd-sensor-colorhug.h +D src/sensors/cd-sensor-dtp94.h +D src/sensors/cd-sensor-dummy.h +D src/sensors/cd-sensor-huey.h + +commit 307cc591f8a42b0468a1ac898a307a8f2080d108 +Author: Richard Hughes +Date: 2015-10-13 + + Install the tmpfiles.d snippet in the right place + +M configure.ac +M data/Makefile.am + +commit 07c265ef6cf8fe6604472a15987040938433f129 +Author: Richard Hughes +Date: 2015-10-13 + + Use g_autoptr() in more places + +M client/cd-it8.c +M contrib/session-helper/cd-example.c +M lib/colord/cd-it8-utils.c +M lib/colord/cd-it8.c +M lib/colord/cd-spectrum.h +M lib/colord/cd-test-daemon.c +M lib/colord/cd-test-private.c +M lib/colorhug/ch-device-queue.c +M lib/colorhug/ch-self-test.c +M lib/ospark/osp-self-test.c +M src/cd-main.c +M src/cd-sensor-client.c +M src/cd-sensor.c +M src/sensors/cd-parse-beagle.c +M src/sensors/cd-sensor-argyll.c +M src/sensors/cd-sensor-dump.c +M src/sensors/cd-sensor-huey.c +M src/sensors/cd-sensor-munki.c +M src/sensors/cd-sensor-spark.c + +commit d1c8abfd482310fdb3bdbb7464216f7f61e221b7 +Author: Richard Hughes +Date: 2015-10-13 + + Add g_autoptr() defines for cd_color* + +M client/cd-util.c +M contrib/session-helper/cd-main.c +M lib/colord/cd-color.h +M lib/colord/cd-test-private.c +M src/cd-sensor.c + +commit 67ba1c8ec83cbc8f9776cbbf6f0dc7c50897e565 +Author: Richard Hughes +Date: 2015-10-13 + + Use G_DECLARE_DERIVABLE_TYPE in libcolord + + This gives us the g_autoptr() macros for free. + +M client/cd-create-profile.c +M client/cd-fix-profile.c +M client/cd-iccdump.c +M client/cd-it8.c +M client/cd-util.c +M configure.ac +M contrib/colord-sane/cd-main.c +M contrib/session-helper/cd-main.c +M contrib/session-helper/cd-state.c +M lib/colord/Makefile.am +D lib/colord/cd-cleanup.h +M lib/colord/cd-client.c +M lib/colord/cd-client.h +M lib/colord/cd-device.c +M lib/colord/cd-device.h +M lib/colord/cd-dom.c +M lib/colord/cd-dom.h +M lib/colord/cd-edid.c +M lib/colord/cd-edid.h +M lib/colord/cd-icc-store.c +M lib/colord/cd-icc-store.h +M lib/colord/cd-icc-utils.c +M lib/colord/cd-icc.c +M lib/colord/cd-icc.h +M lib/colord/cd-interp-akima.c +M lib/colord/cd-interp-akima.h +M lib/colord/cd-interp-linear.h +M lib/colord/cd-interp.c +M lib/colord/cd-interp.h +M lib/colord/cd-it8-utils.c +M lib/colord/cd-it8.c +M lib/colord/cd-it8.h +M lib/colord/cd-profile.c +M lib/colord/cd-profile.h +M lib/colord/cd-sensor.c +M lib/colord/cd-sensor.h +M lib/colord/cd-spectrum.c +M lib/colord/cd-test-daemon.c +M lib/colord/cd-test-private.c +M lib/colord/cd-test-shared.c +M lib/colord/cd-transform.c +M lib/colord/cd-transform.h +M lib/colorhug/ch-device-queue.c +M lib/colorhug/ch-device-queue.h +M lib/colorhug/ch-inhx32.c +M lib/compat/cd-compat-edid.c +M lib/huey/huey-ctx.c +M lib/huey/huey-ctx.h +M lib/ospark/osp-device.c +M lib/ospark/osp-self-test.c +M src/cd-common.c +M src/cd-device-array.c +M src/cd-device-array.h +M src/cd-device-db.c +M src/cd-device-db.h +M src/cd-device.c +M src/cd-device.h +M src/cd-inhibit.c +M src/cd-inhibit.h +M src/cd-main.c +M src/cd-mapping-db.c +M src/cd-mapping-db.h +M src/cd-profile-array.c +M src/cd-profile-array.h +M src/cd-profile-db.c +M src/cd-profile-db.h +M src/cd-profile.c +M src/cd-profile.h +M src/cd-sensor-client.c +M src/cd-sensor-client.h +M src/cd-sensor.c +M src/cd-sensor.h +M src/plugins/cd-plugin-camera.c +M src/plugins/cd-plugin-sane.c +M src/plugins/cd-plugin-scanner.c +M src/sensors/cd-sensor-argyll.c +M src/sensors/cd-sensor-colorhug.c +M src/sensors/cd-sensor-dtp94.c +M src/sensors/cd-sensor-dummy.c +M src/sensors/cd-sensor-huey.c +M src/sensors/cd-sensor-spark.c +M src/sensors/cd-spawn.c + +commit 7999005038cbeaa35221bc7053b74c6cd1daca1b +Author: Richard Hughes +Date: 2015-10-13 + + Port to g_autoptr() + +M client/cd-create-profile.c +M client/cd-fix-profile.c +M client/cd-iccdump.c +M client/cd-it8.c +M client/cd-util.c +M contrib/colord-sane/cd-main.c +M contrib/session-helper/cd-main.c +M contrib/session-helper/cd-state.c +M lib/colord/cd-cleanup.h +M lib/colord/cd-client.c +M lib/colord/cd-device.c +M lib/colord/cd-dom.c +M lib/colord/cd-edid.c +M lib/colord/cd-icc-store.c +M lib/colord/cd-icc-utils.c +M lib/colord/cd-icc.c +M lib/colord/cd-interp-akima.c +M lib/colord/cd-it8-utils.c +M lib/colord/cd-it8.c +M lib/colord/cd-profile.c +M lib/colord/cd-sensor.c +M lib/colord/cd-test-daemon.c +M lib/colord/cd-test-shared.c +M lib/colord/cd-transform.c +M lib/colorhug/ch-device-queue.c +M lib/colorhug/ch-inhx32.c +M lib/compat/cd-compat-edid.c +M lib/ospark/osp-device.c +M lib/ospark/osp-self-test.c +M src/cd-common.c +M src/cd-device-db.c +M src/cd-device.c +M src/cd-inhibit.c +M src/cd-main.c +M src/cd-mapping-db.c +M src/cd-profile-db.c +M src/cd-profile.c +M src/cd-sensor.c +M src/plugins/cd-plugin-camera.c +M src/plugins/cd-plugin-sane.c +M src/plugins/cd-plugin-scanner.c +M src/sensors/cd-sensor-argyll.c +M src/sensors/cd-sensor-colorhug.c +M src/sensors/cd-sensor-dtp94.c +M src/sensors/cd-sensor-dummy.c +M src/sensors/cd-sensor-huey.c +M src/sensors/cd-sensor-spark.c +M src/sensors/cd-spawn.c + +commit 0b7f570b5de671f8d1f7855bb01c0f991ba33752 +Author: Richard Hughes +Date: 2015-10-13 + + Add the start of a Spark sensor driver + +M src/sensors/Makefile.am +A src/sensors/cd-sensor-spark.c + +commit 43f5e453a1a9e8c333155db780659396b09dc160 +Author: Richard Hughes +Date: 2015-10-13 + + libcolord: Add cd_spectrum_subtract() + +M lib/colord/cd-spectrum.c +M lib/colord/cd-spectrum.h +M lib/colord/cd-test-private.c + +commit 3e5a5b0decacc5146d9baafc6bba2ad91591afa8 +Author: Richard Hughes +Date: 2015-10-13 + + trivial: Add a missing file in a header for internal use only + +M lib/colord/colord-private.h + +commit c6d4239217fffffac72c81047af24b3aa0a10122 +Author: Richard Hughes +Date: 2015-10-13 + + Add a sensor error for missing dark calibration + +M client/cd-util.c +M lib/colord/cd-enum.c +M lib/colord/cd-enum.h + +commit 21eb54857e942ab8bccecd9914e19083dd57288b +Author: Richard Hughes +Date: 2015-10-13 + + libcolord: Make cd_spectrum_free() NULL-safe + +M lib/colord/cd-spectrum.c + +commit 2b2c59792551cbadb8eacca50d8751e44c76d413 +Author: Richard Hughes +Date: 2015-10-13 + + Post branch version bump + +M configure.ac + +commit 458e7779b41c4f58164dcdb52b7bd1ff3e9e210e +Author: Richard Hughes +Date: 2015-10-13 + + libcolord: Return an error when we fail to estimate the gamma value + +M lib/colord/cd-it8-utils.c + +commit ce88ff07ebf1b6500c542f82fe07b36554be6ca3 +Author: Tobias Hunger +Date: 2015-10-01 + + Add a tmpfiles.d snippet to fix stateless systems + + Signed-off-by: Richard Hughes + +M contrib/colord.spec.in +M data/Makefile.am +A data/colord.conf + +commit a47a96de5e80acc75409bb3696a309bb92ab6430 +Author: Simon McVittie +Date: 2015-09-24 + + Add a systemd user service corresponding to the D-Bus session service + + This ensures that it ends up in its own cgroup under systemd user + sessions where dbus-daemon uses systemd activation, rather than + being treated as part of dbus.service. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92165 + + Signed-off-by: Richard Hughes + +M contrib/colord.spec.in +M contrib/session-helper/Makefile.am +A contrib/session-helper/colord-session.service.in +M contrib/session-helper/org.freedesktop.ColorHelper.service.in + +commit dfe3d0c32e686f40d8c4ec831a100eb944bde5d0 +Author: Richard Hughes +Date: 2015-08-19 + + trivial: post release version bump + +M RELEASE +M configure.ac + commit 168025b9530e877ee25c707944f95e0f60859eb7 Author: Richard Hughes -Date: 2015-08-19 +Date: 2015-08-19 Release colord 1.2.12 diff -Nru colord-1.2.12/client/cd-create-profile.c colord-1.3.2/client/cd-create-profile.c --- colord-1.2.12/client/cd-create-profile.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/client/cd-create-profile.c 2015-10-13 15:24:13.000000000 +0000 @@ -29,8 +29,6 @@ #include #include -#include "cd-cleanup.h" - #define LCMS_CURVE_PLUGIN_TYPE_REC709 1024 typedef struct { @@ -96,15 +94,15 @@ gdouble tlimit; gint exit_status = 0; gsize len = 0; - _cleanup_free_ gchar *cmdline = NULL; - _cleanup_free_ gchar *data = NULL; - _cleanup_free_ gchar *debug_stderr = NULL; - _cleanup_free_ gchar *debug_stdout = NULL; - _cleanup_free_ gchar *output_fn = NULL; - _cleanup_free_ gchar *ti3_fn = NULL; - _cleanup_object_unref_ GFile *output_file = NULL; - _cleanup_object_unref_ GFile *ti3_file = NULL; - _cleanup_ptrarray_unref_ GPtrArray *argv = NULL; + g_autofree gchar *cmdline = NULL; + g_autofree gchar *data = NULL; + g_autofree gchar *debug_stderr = NULL; + g_autofree gchar *debug_stdout = NULL; + g_autofree gchar *output_fn = NULL; + g_autofree gchar *ti3_fn = NULL; + g_autoptr(GFile) output_file = NULL; + g_autoptr(GFile) ti3_file = NULL; + g_autoptr(GPtrArray) argv = NULL; #ifndef TOOL_COLPROF /* no support */ @@ -664,8 +662,8 @@ { const gchar *tmp; gdouble coverage = 0.0f; - _cleanup_free_ gchar *coverage_tmp = NULL; - _cleanup_object_unref_ CdIcc *icc_srgb = NULL; + g_autofree gchar *coverage_tmp = NULL; + g_autoptr(CdIcc) icc_srgb = NULL; /* is sRGB? */ tmp = cd_icc_get_metadata_item (icc, CD_PROFILE_METADATA_STANDARD_SPACE); @@ -700,8 +698,8 @@ gboolean ret = TRUE; GHashTable *hash; gssize data_len = -1; - _cleanup_free_ gchar *data = NULL; - _cleanup_object_unref_ CdDom *dom = NULL; + g_autofree gchar *data = NULL; + g_autoptr(CdDom) dom = NULL; /* parse the XML into DOM */ if (!g_file_get_contents (filename, &data, (gsize *) &data_len, error)) @@ -802,10 +800,10 @@ CdUtilPrivate *priv; gboolean ret; guint retval = EXIT_FAILURE; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *cmd_descriptions = NULL; - _cleanup_free_ gchar *filename = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *cmd_descriptions = NULL; + g_autofree gchar *filename = NULL; + g_autoptr(GFile) file = NULL; const GOptionEntry options[] = { { "output", 'o', 0, G_OPTION_ARG_STRING, &filename, /* TRANSLATORS: command line option */ diff -Nru colord-1.2.12/client/cd-fix-profile.c colord-1.3.2/client/cd-fix-profile.c --- colord-1.2.12/client/cd-fix-profile.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/client/cd-fix-profile.c 2015-10-13 15:24:13.000000000 +0000 @@ -28,8 +28,6 @@ #include #include -#include "cd-cleanup.h" - #define CD_PROFILE_DEFAULT_COPYRIGHT_STRING "This profile is free of known copyright restrictions." typedef struct { @@ -79,7 +77,7 @@ { CdUtilItem *item; guint i; - _cleanup_strv_free_ gchar **names = NULL; + g_auto(GStrv) names = NULL; /* add each one */ names = g_strsplit (name, ",", -1); @@ -151,7 +149,7 @@ { CdUtilItem *item; guint i; - _cleanup_string_free_ GString *string = NULL; + g_autoptr(GString) string = NULL; /* find command */ for (i = 0; i < priv->cmd_array->len; i++) { @@ -258,7 +256,7 @@ static gboolean cd_util_clear_metadata (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_hashtable_unref_ GHashTable *md = NULL; + g_autoptr(GHashTable) md = NULL; md = cd_icc_get_metadata (priv->icc); if (md == NULL) return TRUE; @@ -275,7 +273,7 @@ GError **error) { gchar *filename = NULL; - _cleanup_object_unref_ CdProfile *profile_tmp = NULL; + g_autoptr(CdProfile) profile_tmp = NULL; /* try to find */ if (!cd_client_connect_sync (priv->client, NULL, error)) @@ -413,8 +411,8 @@ cd_util_export_tag_data (CdUtilPrivate *priv, gchar **values, GError **error) { gboolean ret; - _cleanup_bytes_unref_ GBytes *data = NULL; - _cleanup_free_ gchar *out_fn = NULL; + g_autoptr(GBytes) data = NULL; + g_autofree gchar *out_fn = NULL; /* check arguments */ if (g_strv_length (values) != 2) { @@ -637,10 +635,10 @@ gboolean ret = TRUE; gboolean verbose = FALSE; guint retval = 1; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *cmd_descriptions = NULL; - _cleanup_free_ gchar *locale = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *cmd_descriptions = NULL; + g_autofree gchar *locale = NULL; + g_autoptr(GFile) file = NULL; const GOptionEntry options[] = { { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, /* TRANSLATORS: command line option */ diff -Nru colord-1.2.12/client/cd-iccdump.c colord-1.3.2/client/cd-iccdump.c --- colord-1.2.12/client/cd-iccdump.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/client/cd-iccdump.c 2015-10-13 15:24:13.000000000 +0000 @@ -29,8 +29,6 @@ #include #include -#include "cd-cleanup.h" - static gint lcms_error_code = 0; /** @@ -53,9 +51,9 @@ static gboolean cd_iccdump_print_file (const gchar *filename, GError **error) { - _cleanup_free_ gchar *str = NULL; - _cleanup_object_unref_ CdIcc *icc = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autofree gchar *str = NULL; + g_autoptr(CdIcc) icc = NULL; + g_autoptr(GFile) file = NULL; /* load the profile */ icc = cd_icc_new (); @@ -79,7 +77,7 @@ GOptionContext *context; gint i; guint retval = EXIT_FAILURE; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; setlocale (LC_ALL, ""); diff -Nru colord-1.2.12/client/cd-it8.c colord-1.3.2/client/cd-it8.c --- colord-1.2.12/client/cd-it8.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/client/cd-it8.c 2015-10-13 15:51:53.000000000 +0000 @@ -28,8 +28,6 @@ #include #include -#include "cd-cleanup.h" - #define CD_ERROR 1 #define CD_ERROR_INVALID_ARGUMENTS 0 #define CD_ERROR_NO_SUCH_CMD 1 @@ -83,7 +81,7 @@ { guint i; CdUtilItem *item; - _cleanup_strv_free_ gchar **names = NULL; + g_auto(GStrv) names = NULL; g_return_if_fail (name != NULL); g_return_if_fail (description != NULL); @@ -161,7 +159,7 @@ { guint i; CdUtilItem *item; - _cleanup_string_free_ GString *string = NULL; + g_autoptr(GString) string = NULL; /* find command */ for (i = 0; i < priv->cmd_array->len; i++) { @@ -213,12 +211,12 @@ gchar *dot; guint i; gdouble norm; - _cleanup_free_ gchar *data = NULL; - _cleanup_free_ gchar *title = NULL; - _cleanup_object_unref_ CdIt8 *cmf = NULL; - _cleanup_object_unref_ GFile *file = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; - _cleanup_strv_free_ gchar **lines = NULL; + g_autofree gchar *data = NULL; + g_autofree gchar *title = NULL; + g_autoptr(CdIt8) cmf = NULL; + g_autoptr(GFile) file = NULL; + g_autoptr(GPtrArray) array = NULL; + g_auto(GStrv) lines = NULL; if (g_strv_length (values) != 3) { g_set_error_literal (error, @@ -238,7 +236,7 @@ array = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_csv2cmf_data_free); lines = g_strsplit (data, "\n", -1); for (i = 0; lines[i] != NULL; i++) { - _cleanup_strv_free_ gchar **split = NULL; + g_auto(GStrv) split = NULL; if (lines[i][0] == '\0') continue; if (lines[i][0] == '#') @@ -328,13 +326,13 @@ GError **error) { gchar *tmp; - _cleanup_free_ gchar *basename = NULL; - _cleanup_object_unref_ CdIt8 *it8_ccmx = NULL; - _cleanup_object_unref_ CdIt8 *it8_meas = NULL; - _cleanup_object_unref_ CdIt8 *it8_ref = NULL; - _cleanup_object_unref_ GFile *file_ccmx = NULL; - _cleanup_object_unref_ GFile *file_meas = NULL; - _cleanup_object_unref_ GFile *file_ref = NULL; + g_autofree gchar *basename = NULL; + g_autoptr(CdIt8) it8_ccmx = NULL; + g_autoptr(CdIt8) it8_meas = NULL; + g_autoptr(CdIt8) it8_ref = NULL; + g_autoptr(GFile) file_ccmx = NULL; + g_autoptr(GFile) file_meas = NULL; + g_autoptr(GFile) file_ref = NULL; /* check args */ if (g_strv_length (values) != 3) { @@ -383,18 +381,17 @@ gchar **values, GError **error) { - CdSpectrum *spectrum = NULL; CdSpectrumData *tmp; - gboolean ret = TRUE; gchar *dot; gdouble norm; guint i; - _cleanup_free_ gchar *data = NULL; - _cleanup_free_ gchar *title = NULL; - _cleanup_object_unref_ CdIt8 *cmf = NULL; - _cleanup_object_unref_ GFile *file = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; - _cleanup_strv_free_ gchar **lines = NULL; + g_autofree gchar *data = NULL; + g_autofree gchar *title = NULL; + g_auto(GStrv) lines = NULL; + g_autoptr(CdIt8) cmf = NULL; + g_autoptr(CdSpectrum) spectrum = NULL; + g_autoptr(GFile) file = NULL; + g_autoptr(GPtrArray) array = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -413,7 +410,7 @@ lines = g_strsplit (data, "\n", -1); norm = g_strtod (values[2], NULL); for (i = 0; lines[i] != NULL; i++) { - _cleanup_strv_free_ gchar **split = NULL; + g_auto(GStrv) split = NULL; if (lines[i][0] == '\0') continue; if (lines[i][0] == '#') @@ -470,13 +467,7 @@ /* save */ file = g_file_new_for_path (values[0]); - ret = cd_it8_save_to_file (cmf, file, error); - if (!ret) - goto out; -out: - if (spectrum != NULL) - cd_spectrum_free (spectrum); - return ret; + return cd_it8_save_to_file (cmf, file, error); } /** @@ -498,8 +489,8 @@ gboolean ret; gboolean verbose = FALSE; guint retval = 1; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *cmd_descriptions = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *cmd_descriptions = NULL; const GOptionEntry options[] = { { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, /* TRANSLATORS: command line option */ diff -Nru colord-1.2.12/client/cd-util.c colord-1.3.2/client/cd-util.c --- colord-1.2.12/client/cd-util.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/client/cd-util.c 2015-10-27 10:16:08.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2010-2014 Richard Hughes + * Copyright (C) 2010-2015 Richard Hughes * * Licensed under the GNU General Public License Version 2 * @@ -29,10 +29,10 @@ #endif #include #include +#include +#include #include -#include "cd-cleanup.h" - #define CD_ERROR 1 #define CD_ERROR_INVALID_ARGUMENTS 0 #define CD_ERROR_NO_SUCH_CMD 1 @@ -124,7 +124,7 @@ gint64 usecs) { GDateTime *datetime; - _cleanup_free_ gchar *str = NULL; + g_autofree gchar *str = NULL; datetime = g_date_time_new_from_unix_utc (usecs / G_USEC_PER_SEC); /* TRANSLATORS: this is the profile creation date strftime format */ @@ -145,7 +145,7 @@ /* TRANSLATORS: profile owner */ cd_util_print_field (_("Owner"), "owner", priv, pw->pw_name); #else - _cleanup_free_ gchar *str = NULL; + g_autofree gchar *str = NULL; str = g_strdup_printf ("%u", uid); /* TRANSLATORS: profile UID */ cd_util_print_field (_("Owner"), "owner", priv, str); @@ -167,8 +167,8 @@ GList *l; guint i; guint size; - _cleanup_hashtable_unref_ GHashTable *metadata = NULL; - _cleanup_list_free_ GList *list = NULL; + g_autoptr(GHashTable) metadata = NULL; + g_autoptr(GList) list = NULL; /* TRANSLATORS: the internal DBus path */ cd_util_print_field (_("Object Path"), @@ -273,8 +273,8 @@ GList *l; GPtrArray *profiles; guint i; - _cleanup_hashtable_unref_ GHashTable *metadata = NULL; - _cleanup_list_free_ GList *list = NULL; + g_autoptr(GHashTable) metadata = NULL; + g_autoptr(GList) list = NULL; /* TRANSLATORS: the internal DBus path */ cd_util_print_field (_("Object Path"), @@ -449,6 +449,18 @@ /* TRANSLATORS: this is the display technology */ return _("Calibration"); } + if (sensor_cap == CD_SENSOR_CAP_CALIBRATION_DARK) { + /* TRANSLATORS: this is the display calibration type */ + return _("Dark Calibration"); + } + if (sensor_cap == CD_SENSOR_CAP_CALIBRATION_IRRADIANCE) { + /* TRANSLATORS: this is the display calibration type */ + return _("Irradiance Calibration"); + } + if (sensor_cap == CD_SENSOR_CAP_SPECTRAL) { + /* TRANSLATORS: this is the sensor capability */ + return _("Spectral"); + } if (sensor_cap == CD_SENSOR_CAP_LCD) { /* TRANSLATORS: this is the display technology, * where LCD stands for 'Liquid Crystal Display' */ @@ -513,11 +525,11 @@ guint caps; guint i; GVariant *value_tmp; - _cleanup_error_free_ GError *error = NULL; - _cleanup_hashtable_unref_ GHashTable *metadata = NULL; - _cleanup_hashtable_unref_ GHashTable *options = NULL; - _cleanup_list_free_ GList *list = NULL; - _cleanup_string_free_ GString *caps_str = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GHashTable) metadata = NULL; + g_autoptr(GHashTable) options = NULL; + g_autoptr(GList) list = NULL; + g_autoptr(GString) caps_str = NULL; /* TRANSLATORS: the internal DBus path */ cd_util_print_field (_("Object Path"), @@ -692,7 +704,7 @@ { guint i; CdUtilItem *item; - _cleanup_strv_free_ gchar **names = NULL; + g_auto(GStrv) names = NULL; g_return_if_fail (name != NULL); g_return_if_fail (description != NULL); @@ -770,7 +782,7 @@ { guint i; CdUtilItem *item; - _cleanup_string_free_ GString *string = NULL; + g_autoptr(GString) string = NULL; /* find command */ for (i = 0; i < priv->cmd_array->len; i++) { @@ -808,10 +820,10 @@ GDateTime *dt; GError *error_local = NULL; guint i; - _cleanup_free_ gchar *mapping_db = NULL; - _cleanup_ptrarray_unref_ GPtrArray *devices = NULL; - _cleanup_ptrarray_unref_ GPtrArray *profiles = NULL; - _cleanup_string_free_ GString *str = NULL; + g_autofree gchar *mapping_db = NULL; + g_autoptr(GPtrArray) devices = NULL; + g_autoptr(GPtrArray) profiles = NULL; + g_autoptr(GString) str = NULL; /* header */ str = g_string_new (""); @@ -913,7 +925,7 @@ { CdDevice *device; guint i; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; /* execute sync method */ array = cd_client_get_devices_sync (priv->client, NULL, error); @@ -938,7 +950,7 @@ { CdDevice *device; guint i; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -976,7 +988,7 @@ { CdProfile *profile; guint i; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; /* execute sync method */ array = cd_client_get_profiles_sync (priv->client, NULL, error); @@ -1001,7 +1013,7 @@ { CdSensor *sensor; guint i; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; /* execute sync method */ array = cd_client_get_sensors_sync (priv->client, NULL, error); @@ -1033,7 +1045,7 @@ CdSensor *sensor; GMainLoop *loop = NULL; guint i; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; /* execute sync method */ array = cd_client_get_sensors_sync (priv->client, NULL, error); @@ -1068,13 +1080,13 @@ static gboolean cd_util_get_sensor_reading (CdUtilPrivate *priv, gchar **values, GError **error) { - CdColorXYZ *xyz; CdSensorCap cap; + CdSensorCap cap_tmp = CD_SENSOR_CAP_UNKNOWN; CdSensor *sensor; GError *error_local = NULL; guint i; guint j; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -1098,6 +1110,7 @@ } cap = cd_sensor_cap_from_string (values[0]); for (i = 0; i < array->len; i++) { + g_autoptr(CdColorXYZ) xyz = NULL; sensor = g_ptr_array_index (array, i); if (!cd_sensor_connect_sync (sensor, NULL, error)) @@ -1115,7 +1128,7 @@ /* get 3 samples sync */ for (j = 1; j < 4; j++) { xyz = cd_sensor_get_sample_sync (sensor, - cap, + cap_tmp ? cap_tmp : cap, NULL, &error_local); if (xyz == NULL) { @@ -1137,6 +1150,26 @@ j--; g_clear_error (&error_local); continue; + } else if (g_error_matches (error_local, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_REQUIRED_DARK_CALIBRATION)) { + /* TRANSLATORS: the user needs to change something on the device */ + g_print ("%s\n", _("Put the device in a dark place and press enter.")); + getchar (); + j--; + g_clear_error (&error_local); + cap_tmp = CD_SENSOR_CAP_CALIBRATION_DARK; + continue; + } else if (g_error_matches (error_local, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_REQUIRED_IRRADIANCE_CALIBRATION)) { + /* TRANSLATORS: the user needs to change something on the device */ + g_print ("%s\n", _("Calibrate with a 3200K light source.")); + getchar (); + j--; + g_clear_error (&error_local); + cap_tmp = CD_SENSOR_CAP_CALIBRATION_IRRADIANCE; + continue; } else { g_propagate_error (error, error_local); @@ -1144,11 +1177,18 @@ } } + /* reset back */ + if (cap_tmp == CD_SENSOR_CAP_CALIBRATION_DARK || + cap_tmp == CD_SENSOR_CAP_CALIBRATION_IRRADIANCE) { + cap_tmp = CD_SENSOR_CAP_UNKNOWN; + g_print ("%s\n", _("Put the device on the color to be measured and press enter.")); + getchar (); + } + /* TRANSLATORS: this is the XYZ color value */ g_print ("%s XYZ : %f, %f, %f\n", _("Color"), xyz->X, xyz->Y, xyz->Z); - cd_color_xyz_free (xyz); } /* unlock */ @@ -1159,6 +1199,101 @@ } /** + * cd_util_get_spectral_reading: + **/ +static gboolean +cd_util_get_spectral_reading (CdUtilPrivate *priv, gchar **values, GError **error) +{ + CdSensorCap cap; + CdSensor *sensor; + GError *error_local = NULL; + guint i; + guint width = 130; + guint height = 30; + struct winsize w; + g_autoptr(GPtrArray) array = NULL; + + if (g_strv_length (values) < 1) { + g_set_error_literal (error, + CD_ERROR, + CD_ERROR_INVALID_ARGUMENTS, + "Not enough arguments, " + "expected device type " + "e.g. 'calibration' or 'spectral'"); + return FALSE; + } + + /* get window size */ + if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &w) == 0) { + width = w.ws_col - 1; + height = w.ws_row * 3 / 4; + } + + /* execute sync method */ + array = cd_client_get_sensors_sync (priv->client, NULL, error); + if (array == NULL) + return FALSE; + if (array->len == 0) { + /* TRANSLATORS: the user does not have a colorimeter attached */ + g_set_error_literal (error, CD_ERROR, CD_ERROR_INVALID_ARGUMENTS, + _("There are no supported sensors attached")); + return FALSE; + } + cap = cd_sensor_cap_from_string (values[0]); + for (i = 0; i < array->len; i++) { + g_autofree gchar *txt = NULL; + g_autoptr(CdSpectrum) sp = NULL; + + sensor = g_ptr_array_index (array, i); + + if (!cd_sensor_connect_sync (sensor, NULL, error)) + return FALSE; + + /* can we do spectral */ + if (!cd_sensor_has_cap (sensor, CD_SENSOR_CAP_SPECTRAL)) { + /* TRANSLATORS: sensor can't do this */ + g_print ("%s\n", _("No spectral capability")); + continue; + } + + /* TRANSLATORS: this is the sensor title */ + g_print ("%s: %s - %s\n", _("Sensor"), + cd_sensor_get_vendor (sensor), + cd_sensor_get_model (sensor)); + + /* lock */ + if (!cd_sensor_lock_sync (sensor, NULL, error)) + return FALSE; + + /* get data */ + sp = cd_sensor_get_spectrum_sync (sensor, cap, NULL, &error_local); + if (sp == NULL) { + if (g_error_matches (error_local, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT)) { + /* TRANSLATORS: sensor can't do this */ + g_print ("%s: %s\n", _("No spectral capability"), + error_local->message); + g_clear_error (&error_local); + continue; + } + g_propagate_error (error, error_local); + error_local = NULL; + return FALSE; + } + + /* print to console */ + txt = cd_spectrum_to_string (sp, width, height); + g_print ("%s", txt); + + /* unlock */ + if (!cd_sensor_unlock_sync (sensor, NULL, error)) + return FALSE; + } + return TRUE; +} + +/** * cd_util_sensor_set_options: **/ static gboolean @@ -1168,8 +1303,8 @@ gchar *endptr = NULL; gdouble val; guint i; - _cleanup_hashtable_unref_ GHashTable *options = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GHashTable) options = NULL; + g_autoptr(GPtrArray) array = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1239,8 +1374,8 @@ cd_util_create_device (CdUtilPrivate *priv, gchar **values, GError **error) { guint mask; - _cleanup_hashtable_unref_ GHashTable *device_props = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(GHashTable) device_props = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 3) { g_set_error_literal (error, @@ -1279,7 +1414,7 @@ static gboolean cd_util_find_device (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -1308,7 +1443,7 @@ static gboolean cd_util_find_device_by_property (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1340,7 +1475,7 @@ static gboolean cd_util_find_profile (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -1369,7 +1504,7 @@ static gboolean cd_util_find_profile_by_filename (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -1398,7 +1533,7 @@ static gboolean cd_util_get_standard_space (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -1429,7 +1564,7 @@ static gboolean cd_util_create_profile (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdProfile) profile = NULL; guint mask; if (g_strv_length (values) < 2) { @@ -1461,8 +1596,8 @@ static gboolean cd_util_device_add_profile (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1508,8 +1643,8 @@ static gboolean cd_util_device_make_profile_default (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1551,7 +1686,7 @@ static gboolean cd_util_delete_device (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -1581,7 +1716,7 @@ static gboolean cd_util_delete_profile (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -1611,7 +1746,7 @@ static gboolean cd_util_profile_set_property (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 3) { g_set_error_literal (error, @@ -1647,7 +1782,7 @@ static gboolean cd_util_device_set_model (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1679,7 +1814,7 @@ static gboolean cd_util_device_set_enabled (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1715,8 +1850,8 @@ gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -1759,7 +1894,7 @@ static gboolean cd_util_device_set_vendor (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1791,7 +1926,7 @@ static gboolean cd_util_device_set_serial (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1823,7 +1958,7 @@ static gboolean cd_util_device_set_kind (CdUtilPrivate *priv, gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1857,7 +1992,7 @@ { GMainLoop *loop = NULL; gint timeout; - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1914,8 +2049,8 @@ gchar **values, GError **error) { - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; if (g_strv_length (values) < 2) { g_set_error_literal (error, @@ -1958,8 +2093,8 @@ gchar **values, GError **error) { - _cleanup_object_unref_ CdProfile *profile = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(CdProfile) profile = NULL; + g_autoptr(GFile) file = NULL; if (g_strv_length (values) < 1) { g_set_error_literal (error, @@ -2004,9 +2139,9 @@ gboolean verbose = FALSE; gboolean version = FALSE; guint retval = 1; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *cmd_descriptions = NULL; - _cleanup_free_ gchar *filter = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *cmd_descriptions = NULL; + g_autofree gchar *filter = NULL; const GOptionEntry options[] = { { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, /* TRANSLATORS: command line option */ @@ -2065,6 +2200,12 @@ _("Gets all the available color sensors"), cd_util_get_sensors); cd_util_add (priv->cmd_array, + "get-spectral-reading", + "[KIND]", + /* TRANSLATORS: command description */ + _("Gets a spectral reading from a sensor"), + cd_util_get_spectral_reading); + cd_util_add (priv->cmd_array, "get-sensor-reading", "[KIND]", /* TRANSLATORS: command description */ @@ -2269,7 +2410,7 @@ ret = cd_util_run (priv, argv[1], (gchar**) &argv[2], &error); if (!ret) { if (g_error_matches (error, CD_ERROR, CD_ERROR_NO_SUCH_CMD)) { - _cleanup_free_ gchar *tmp = NULL; + g_autofree gchar *tmp = NULL; tmp = g_option_context_get_help (priv->context, TRUE, NULL); g_print ("%s", tmp); } else { diff -Nru colord-1.2.12/client/Makefile.am colord-1.3.2/client/Makefile.am --- colord-1.2.12/client/Makefile.am 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/client/Makefile.am 2016-02-17 13:31:44.000000000 +0000 @@ -25,7 +25,7 @@ cd-it8 \ cd-fix-profile -if HAVE_UNIX +if HAVE_DAEMON bin_PROGRAMS += \ colormgr endif diff -Nru colord-1.2.12/client/Makefile.in colord-1.3.2/client/Makefile.in --- colord-1.2.12/client/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/client/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -90,8 +90,8 @@ host_triplet = @host@ bin_PROGRAMS = cd-create-profile$(EXEEXT) cd-iccdump$(EXEEXT) \ cd-it8$(EXEEXT) cd-fix-profile$(EXEEXT) $(am__EXEEXT_1) -@HAVE_UNIX_TRUE@am__append_1 = \ -@HAVE_UNIX_TRUE@ colormgr +@HAVE_DAEMON_TRUE@am__append_1 = \ +@HAVE_DAEMON_TRUE@ colormgr subdir = client ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -115,7 +115,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@HAVE_UNIX_TRUE@am__EXEEXT_1 = colormgr$(EXEEXT) +@HAVE_DAEMON_TRUE@am__EXEEXT_1 = colormgr$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_cd_create_profile_OBJECTS = \ @@ -336,6 +336,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -440,6 +441,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/config.h colord-1.3.2/config.h --- colord-1.2.12/config.h 2015-06-25 16:53:27.000000000 +0000 +++ colord-1.3.2/config.h 2016-02-17 13:19:04.000000000 +0000 @@ -83,8 +83,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Name of package */ @@ -97,7 +96,7 @@ #define PACKAGE_NAME "colord" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "colord 1.2.12" +#define PACKAGE_STRING "colord 1.3.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "colord" @@ -106,7 +105,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.12" +#define PACKAGE_VERSION "1.3.2" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -118,4 +117,4 @@ #define USE_POLKIT 1 /* Version number of package */ -#define VERSION "1.2.12" +#define VERSION "1.3.2" diff -Nru colord-1.2.12/config.h.in colord-1.3.2/config.h.in --- colord-1.2.12/config.h.in 2015-07-29 14:28:20.000000000 +0000 +++ colord-1.3.2/config.h.in 2016-02-17 13:32:59.000000000 +0000 @@ -82,8 +82,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -Nru colord-1.2.12/configure colord-1.3.2/configure --- colord-1.2.12/configure 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/configure 2016-02-17 13:32:56.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for colord 1.2.12. +# Generated by GNU Autoconf 2.69 for colord 1.3.2. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='colord' PACKAGE_TARNAME='colord' -PACKAGE_VERSION='1.2.12' -PACKAGE_STRING='colord 1.2.12' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='colord 1.3.2' PACKAGE_BUGREPORT='http://www.freedesktop.org/software/colord/' PACKAGE_URL='' @@ -677,6 +677,7 @@ HAVE_LIBSYSTEMD_LOGIN_TRUE BUILD_LIBCOLORDCOMPAT_FALSE BUILD_LIBCOLORDCOMPAT_TRUE +tmpfilesdir HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE systemdsystemunitdir @@ -706,8 +707,10 @@ HAVE_GUSB_TRUE GUSB_LIBS GUSB_CFLAGS -HAVE_UNIX_FALSE -HAVE_UNIX_TRUE +HAVE_DAEMON_FALSE +HAVE_DAEMON_TRUE +HAVE_SESSION_HELPER_FALSE +HAVE_SESSION_HELPER_TRUE CD_CREATE_PROFILE CD_IT8 WINE @@ -812,6 +815,7 @@ PKG_CONFIG_PATH PKG_CONFIG CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -931,6 +935,7 @@ enable_static with_pic enable_fast_install +with_aix_soname enable_dependency_tracking with_gnu_ld with_sysroot @@ -946,11 +951,14 @@ enable_rpath with_libiconv_prefix with_libintl_prefix +enable_session_helper +enable_daemon enable_gusb enable_udev enable_bash_completion enable_polkit with_systemdsystemunitdir +with_tmpfilesdir enable_libcolordcompat enable_systemd_login with_udevrulesdir @@ -972,6 +980,7 @@ LDFLAGS LIBS CPPFLAGS +LT_SYS_LIBRARY_PATH CPP PKG_CONFIG PKG_CONFIG_PATH @@ -1548,7 +1557,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures colord 1.2.12 to adapt to many kinds of systems. +\`configure' configures colord 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1618,7 +1627,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of colord 1.2.12:";; + short | recursive ) echo "Configuration of colord 1.3.2:";; esac cat <<\_ACEOF @@ -1647,6 +1656,8 @@ --disable-nls do not use Native Language Support --enable-strict Enable strict compilation options --disable-rpath do not hardcode runtime library paths + --enable-session-helper Enable Session Helper + --enable-daemon Enable daemon --enable-gusb Enable GUSB support --enable-udev Enable GUDEV support --enable-bash-completion @@ -1672,9 +1683,12 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-html-dir=PATH path to installed docs --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib @@ -1683,6 +1697,7 @@ --without-libintl-prefix don't search for libintl in includedir and libdir --with-systemdsystemunitdir=DIR Directory for systemd service files + --with-tmpfilesdir=DIR Directory for tmpfiles.d snippet files --with-udevrulesdir=DIR Directory for udev rules files --with-daemon-user User for running the colord daemon (root) @@ -1694,6 +1709,8 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -1816,7 +1833,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -colord configure 1.2.12 +colord configure 1.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2185,7 +2202,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by colord $as_me 1.2.12, which was +It was created by colord $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3050,7 +3067,7 @@ # Define the identity of the package. PACKAGE='colord' - VERSION='1.2.12' + VERSION='1.3.2' cat >>confdefs.h <<_ACEOF @@ -3270,8 +3287,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -3285,7 +3302,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -3405,7 +3422,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -4767,19 +4784,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -4793,7 +4810,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -4804,7 +4821,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -4815,32 +4832,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -4883,33 +4900,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -4920,15 +4942,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -5034,9 +5056,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -5044,8 +5066,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -5096,7 +5118,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -5136,7 +5158,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5186,22 +5208,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -5219,7 +5242,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -5237,30 +5260,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -5383,13 +5382,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -5517,13 +5516,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -5550,8 +5549,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5587,10 +5585,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5629,7 +5623,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5651,8 +5645,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -5705,6 +5699,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -5862,8 +5859,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -5875,7 +5872,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -6030,7 +6027,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -6038,7 +6035,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -6051,7 +6048,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -6268,7 +6265,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -6358,7 +6355,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -6391,14 +6388,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6416,21 +6443,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -6478,11 +6508,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -6508,7 +6538,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -6528,13 +6558,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -6555,7 +6585,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -6608,6 +6638,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -6620,9 +6660,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -6632,8 +6672,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -6645,18 +6685,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6665,24 +6786,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -6711,9 +6833,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6727,7 +6890,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -6772,7 +6942,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -6812,13 +6982,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6830,7 +7001,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -6839,7 +7010,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -6855,7 +7026,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -6966,7 +7137,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7469,7 +7640,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -7487,7 +7658,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7526,7 +7697,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -7555,7 +7726,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7568,32 +7739,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7601,6 +7772,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7904,14 +8110,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7935,14 +8141,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7966,14 +8172,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7981,8 +8187,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -7998,14 +8202,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8019,11 +8223,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -8072,7 +8328,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -8111,7 +8367,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -8122,14 +8378,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -8138,15 +8394,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -8161,22 +8410,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8199,13 +8448,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8227,22 +8476,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8265,13 +8514,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8292,7 +8541,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8354,7 +8603,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -8370,7 +8619,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8400,7 +8649,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -8418,17 +8667,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -8439,8 +8689,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -8456,6 +8706,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -8526,7 +8781,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -8534,10 +8789,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -8553,7 +8827,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -8562,9 +8836,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -8589,6 +8863,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -8686,7 +8966,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -8715,7 +8995,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -8747,7 +9027,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8777,7 +9057,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -8809,7 +9089,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -8828,13 +9108,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -8954,8 +9234,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -8967,9 +9247,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -9012,9 +9292,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -9029,7 +9309,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -9037,7 +9317,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -9047,7 +9327,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -9069,24 +9349,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -9099,7 +9379,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -9118,7 +9398,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9134,7 +9414,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -9144,7 +9424,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9152,61 +9432,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9217,42 +9525,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9266,8 +9579,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9285,8 +9598,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9298,7 +9611,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -9313,9 +9626,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9332,15 +9645,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -9356,7 +9669,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9364,34 +9677,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -9410,13 +9746,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -9435,35 +9779,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9498,7 +9849,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9506,17 +9857,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9551,7 +9902,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9559,21 +9910,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -9582,7 +9945,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9612,16 +9975,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -9630,18 +9994,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -9650,7 +10014,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -9669,24 +10033,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -9728,33 +10092,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -9762,25 +10126,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -9792,7 +10156,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9811,14 +10175,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -9826,8 +10190,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -9838,7 +10202,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -9849,8 +10213,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -9860,8 +10224,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -9873,24 +10237,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -9905,7 +10279,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -9913,27 +10287,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -9944,33 +10310,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -9981,24 +10367,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -10008,11 +10394,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -10022,10 +10408,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -10074,43 +10460,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -10125,10 +10511,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -10136,7 +10522,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10162,7 +10548,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -10377,14 +10763,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -10400,28 +10786,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -10435,7 +10828,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -10444,7 +10837,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10461,14 +10854,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -10476,41 +10871,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -10520,18 +10965,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -10539,8 +10984,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -10552,7 +10997,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -10561,8 +11006,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -10578,17 +11023,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -10597,8 +11042,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -10625,7 +11070,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -10638,8 +11083,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -10652,7 +11097,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -10665,8 +11110,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -10679,8 +11124,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -10698,12 +11143,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -10728,26 +11174,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10765,14 +11200,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -10780,8 +11216,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -10790,8 +11226,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -10804,8 +11240,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10816,7 +11252,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -10824,8 +11260,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -10844,8 +11280,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -10854,13 +11290,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10907,11 +11363,15 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10928,12 +11388,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -10943,7 +11403,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -10952,58 +11412,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -11014,8 +11484,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -11025,11 +11495,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -11037,8 +11507,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -11059,24 +11529,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -11094,7 +11564,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -11102,8 +11572,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -11113,20 +11583,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -11223,15 +11708,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -11246,12 +11731,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -11261,7 +11746,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -11271,23 +11756,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -11325,10 +11810,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -11336,10 +11821,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -11378,11 +11871,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -11421,7 +11914,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -11460,7 +11953,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -11499,7 +11992,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11520,21 +12013,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -11542,7 +12035,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11589,9 +12082,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11621,7 +12114,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11641,14 +12134,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11695,9 +12188,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11727,7 +12220,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11748,9 +12241,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -11794,7 +12287,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -11822,7 +12315,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -11830,13 +12323,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -11844,8 +12337,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -11855,7 +12352,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -11869,7 +12366,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -12723,8 +13220,8 @@ # use this in cd-version.h CD_MAJOR_VERSION=1 -CD_MINOR_VERSION=2 -CD_MICRO_VERSION=12 +CD_MINOR_VERSION=3 +CD_MICRO_VERSION=2 @@ -12739,7 +13236,7 @@ # REVISION If the API and ABI remains the same, but bugs are fixed. # AGE Don't use. LT_CURRENT=2 -LT_REVISION=4 +LT_REVISION=5 LT_AGE=0 @@ -16116,7 +16613,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then : - LIBM="-lmw" + LIBM=-lmw fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 @@ -16198,7 +16695,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 $as_echo "$ac_cv_lib_m_cos" >&6; } if test "x$ac_cv_lib_m_cos" = xyes; then : - LIBM="-lm" + LIBM=-lm fi ;; @@ -16597,12 +17094,12 @@ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16614,12 +17111,12 @@ pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16640,14 +17137,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0) were not met: $GLIB_PKG_ERRORS @@ -16997,12 +17494,38 @@ fi - if test x$enable_unix = xyes; then - HAVE_UNIX_TRUE= - HAVE_UNIX_FALSE='#' + +# optional +# Check whether --enable-session_helper was given. +if test "${enable_session_helper+set}" = set; then : + enableval=$enable_session_helper; enable_session_helper=$enableval +else + enable_session_helper=$enable_unix +fi + + if test x$enable_session_helper = xyes; then + HAVE_SESSION_HELPER_TRUE= + HAVE_SESSION_HELPER_FALSE='#' +else + HAVE_SESSION_HELPER_TRUE='#' + HAVE_SESSION_HELPER_FALSE= +fi + + +# optional +# Check whether --enable-daemon was given. +if test "${enable_daemon+set}" = set; then : + enableval=$enable_daemon; enable_daemon=$enableval else - HAVE_UNIX_TRUE='#' - HAVE_UNIX_FALSE= + enable_daemon=$enable_unix +fi + + if test x$enable_daemon = xyes; then + HAVE_DAEMON_TRUE= + HAVE_DAEMON_FALSE='#' +else + HAVE_DAEMON_TRUE='#' + HAVE_DAEMON_FALSE= fi @@ -17023,12 +17546,12 @@ pkg_cv_GUSB_CFLAGS="$GUSB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gusb >= 0.2.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gusb >= 0.2.2") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gusb >= 0.2.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gusb >= 0.2.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUSB_CFLAGS=`$PKG_CONFIG --cflags "gusb >= 0.2.2" 2>/dev/null` + pkg_cv_GUSB_CFLAGS=`$PKG_CONFIG --cflags "gusb >= 0.2.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17040,12 +17563,12 @@ pkg_cv_GUSB_LIBS="$GUSB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gusb >= 0.2.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gusb >= 0.2.2") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gusb >= 0.2.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gusb >= 0.2.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUSB_LIBS=`$PKG_CONFIG --libs "gusb >= 0.2.2" 2>/dev/null` + pkg_cv_GUSB_LIBS=`$PKG_CONFIG --libs "gusb >= 0.2.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17066,14 +17589,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gusb >= 0.2.2" 2>&1` + GUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gusb >= 0.2.7" 2>&1` else - GUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gusb >= 0.2.2" 2>&1` + GUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gusb >= 0.2.7" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUSB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gusb >= 0.2.2) were not met: + as_fn_error $? "Package requirements (gusb >= 0.2.7) were not met: $GUSB_PKG_ERRORS @@ -17805,6 +18328,19 @@ fi + +# Check whether --with-tmpfilesdir was given. +if test "${with_tmpfilesdir+set}" = set; then : + withval=$with_tmpfilesdir; +else + with_tmpfilesdir=$($PKG_CONFIG --variable=tmpfilesdir systemd) +fi + +if test "x$with_tmpfilesdir" != "xno"; then + tmpfilesdir=$with_tmpfilesdir + +fi + # Check whether --enable-libcolordcompat was given. if test "${enable_libcolordcompat+set}" = set; then : enableval=$enable_libcolordcompat; build_libcolordcompat=$enableval @@ -19039,8 +19575,12 @@ ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${HAVE_UNIX_TRUE}" && test -z "${HAVE_UNIX_FALSE}"; then - as_fn_error $? "conditional \"HAVE_UNIX\" was never defined. +if test -z "${HAVE_SESSION_HELPER_TRUE}" && test -z "${HAVE_SESSION_HELPER_FALSE}"; then + as_fn_error $? "conditional \"HAVE_SESSION_HELPER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_DAEMON_TRUE}" && test -z "${HAVE_DAEMON_FALSE}"; then + as_fn_error $? "conditional \"HAVE_DAEMON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GUSB_TRUE}" && test -z "${HAVE_GUSB_FALSE}"; then @@ -19504,7 +20044,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by colord $as_me 1.2.12, which was +This file was extended by colord $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19570,7 +20110,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -colord config.status 1.2.12 +colord config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19705,6 +20245,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -19754,10 +20295,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -19822,7 +20366,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -19873,9 +20418,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -19910,7 +20458,7 @@ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -19937,10 +20485,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -19949,19 +20498,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -20717,55 +21263,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -20785,6 +21329,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -20902,18 +21449,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -21004,8 +21560,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -21098,13 +21657,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -21156,13 +21715,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -21171,7 +21789,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -21181,165 +21799,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -21535,6 +21994,7 @@ SANE support: ${has_sane} Udev support: ${enable_udev} GUsb support: ${enable_gusb} + Build daemon: ${enable_daemon} Extra print profiles: ${enable_print_profiles} Install tests: ${enable_installed_tests} ArgyllCMS sensor: ${enable_argyllcms_sensor} @@ -21544,6 +22004,8 @@ udev rules.d dir: ${with_udevrulesdir} systemd-login support: ${enable_systemd_login} systemd service dir: ${with_systemdsystemunitdir} + tmpfiles.d dir: ${with_tmpfilesdir} + Session helper support: ${enable_session_helper} Unix support: ${enable_unix} " diff -Nru colord-1.2.12/configure.ac colord-1.3.2/configure.ac --- colord-1.2.12/configure.ac 2015-07-06 14:32:08.000000000 +0000 +++ colord-1.3.2/configure.ac 2016-02-17 13:32:11.000000000 +0000 @@ -2,8 +2,8 @@ AC_PREREQ(2.63) m4_define([cd_major_version], [1]) -m4_define([cd_minor_version], [2]) -m4_define([cd_micro_version], [12]) +m4_define([cd_minor_version], [3]) +m4_define([cd_micro_version], [2]) m4_define([cd_version], [cd_major_version.cd_minor_version.cd_micro_version]) @@ -39,7 +39,7 @@ # REVISION If the API and ABI remains the same, but bugs are fixed. # AGE Don't use. LT_CURRENT=2 -LT_REVISION=4 +LT_REVISION=5 LT_AGE=0 AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) @@ -150,7 +150,7 @@ dnl - Check library dependencies dnl --------------------------------------------------------------------------- COLORD_REQUIRES_PRIVATE="lcms2" -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.44.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gmodule-2.0) dnl --------------------------------------------------------------------------- dnl - Check Linux-specific dependencies @@ -186,12 +186,21 @@ fi AC_SUBST([CD_IT8]) AC_SUBST([CD_CREATE_PROFILE]) -AM_CONDITIONAL(HAVE_UNIX, test x$enable_unix = xyes) + +# optional +AC_ARG_ENABLE(session_helper, AS_HELP_STRING([--enable-session-helper],[Enable Session Helper]), + enable_session_helper=$enableval, enable_session_helper=$enable_unix) +AM_CONDITIONAL(HAVE_SESSION_HELPER, test x$enable_session_helper = xyes) + +# optional +AC_ARG_ENABLE(daemon, AS_HELP_STRING([--enable-daemon],[Enable daemon]), + enable_daemon=$enableval, enable_daemon=$enable_unix) +AM_CONDITIONAL(HAVE_DAEMON, test x$enable_daemon = xyes) AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]), enable_gusb=$enableval, enable_gusb=yes) if test x$enable_gusb != xno; then - PKG_CHECK_MODULES(GUSB, gusb >= 0.2.2) + PKG_CHECK_MODULES(GUSB, gusb >= 0.2.7) AC_DEFINE(HAVE_GUSB,1,[whether gusb is available]) fi AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes) @@ -254,6 +263,17 @@ fi AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"]) +dnl --------------------------------------------------------------------------- +dnl - Where to install tmpfiles.d snippet rules +dnl --------------------------------------------------------------------------- +AC_ARG_WITH([tmpfilesdir], + AS_HELP_STRING([--with-tmpfilesdir=DIR], [Directory for tmpfiles.d snippet files]), + [], + [with_tmpfilesdir=$($PKG_CONFIG --variable=tmpfilesdir systemd)]) +if test "x$with_tmpfilesdir" != "xno"; then + AC_SUBST([tmpfilesdir], [$with_tmpfilesdir]) +fi + dnl **** Check if we should build libcolordcompat **** AC_ARG_ENABLE(libcolordcompat, AS_HELP_STRING([--enable-libcolordcompat], [Enable libcolordcompat.so which is used by ArgyllCMS]), @@ -499,6 +519,7 @@ SANE support: ${has_sane} Udev support: ${enable_udev} GUsb support: ${enable_gusb} + Build daemon: ${enable_daemon} Extra print profiles: ${enable_print_profiles} Install tests: ${enable_installed_tests} ArgyllCMS sensor: ${enable_argyllcms_sensor} @@ -508,6 +529,8 @@ udev rules.d dir: ${with_udevrulesdir} systemd-login support: ${enable_systemd_login} systemd service dir: ${with_systemdsystemunitdir} + tmpfiles.d dir: ${with_tmpfilesdir} + Session helper support: ${enable_session_helper} Unix support: ${enable_unix} " diff -Nru colord-1.2.12/contrib/colord-sane/cd-main.c colord-1.3.2/contrib/colord-sane/cd-main.c --- colord-1.2.12/contrib/colord-sane/cd-main.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/contrib/colord-sane/cd-main.c 2015-10-13 15:24:13.000000000 +0000 @@ -30,8 +30,6 @@ #include #include -#include "cd-cleanup.h" - typedef struct { gchar *argv0; CdClient *client; @@ -100,8 +98,8 @@ gpointer user_data) { CdClient *client = CD_CLIENT (source_object); - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(CdDevice) device = NULL; /* get result */ device = cd_client_create_device_finish (client, res, &error); @@ -116,10 +114,10 @@ cd_sane_client_add (CdMainPrivate *priv, const SANE_Device *sane_device) { CdMainDev *dev; - _cleanup_free_ gchar *id = NULL; - _cleanup_free_ gchar *model = NULL; - _cleanup_free_ gchar *vendor = NULL; - _cleanup_hashtable_unref_ GHashTable *properties = NULL; + g_autofree gchar *id = NULL; + g_autofree gchar *model = NULL; + g_autofree gchar *vendor = NULL; + g_autoptr(GHashTable) properties = NULL; /* ignore noname, no support devices */ if (g_strcmp0 (sane_device->vendor, "Noname") == 0) { @@ -188,7 +186,7 @@ gpointer user_data) { CdClient *client = CD_CLIENT (source_object); - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* get result */ if (!cd_client_delete_device_finish (client, res, &error)) @@ -267,7 +265,7 @@ CdMainPrivate *priv = (CdMainPrivate *) user_data; const gchar *cmdline; gboolean ret; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; ret = cd_device_connect_sync (device, NULL, &error); @@ -298,7 +296,7 @@ { CdMainPrivate *priv = (CdMainPrivate *) user_data; GPtrArray *devices; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; devices = cd_client_get_devices_by_kind_finish (priv->client, res, &error); if (error != NULL) { @@ -324,7 +322,7 @@ { CdMainPrivate *priv = (CdMainPrivate *) user_data; gboolean ret; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* get result */ ret = cd_client_connect_finish (priv->client, res, &error); diff -Nru colord-1.2.12/contrib/colord-sane/Makefile.in colord-1.3.2/contrib/colord-sane/Makefile.in --- colord-1.2.12/contrib/colord-sane/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/contrib/colord-sane/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -302,6 +302,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -406,6 +407,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/contrib/Makefile.am colord-1.3.2/contrib/Makefile.am --- colord-1.2.12/contrib/Makefile.am 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/contrib/Makefile.am 2016-02-17 13:20:08.000000000 +0000 @@ -1,6 +1,6 @@ SUBDIRS = -if HAVE_UNIX +if HAVE_SESSION_HELPER SUBDIRS += \ session-helper endif diff -Nru colord-1.2.12/contrib/Makefile.in colord-1.3.2/contrib/Makefile.in --- colord-1.2.12/contrib/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/contrib/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -87,8 +87,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_UNIX_TRUE@am__append_1 = \ -@HAVE_UNIX_TRUE@ session-helper +@HAVE_SESSION_HELPER_TRUE@am__append_1 = \ +@HAVE_SESSION_HELPER_TRUE@ session-helper @HAVE_SANE_TRUE@am__append_2 = \ @HAVE_SANE_TRUE@ colord-sane @@ -309,6 +309,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -413,6 +414,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/contrib/session-helper/cd-example.c colord-1.3.2/contrib/session-helper/cd-example.c --- colord-1.2.12/contrib/session-helper/cd-example.c 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/contrib/session-helper/cd-example.c 2015-10-13 15:42:03.000000000 +0000 @@ -254,7 +254,7 @@ const gchar *profile_path = NULL; const gchar *str = NULL; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GPtrArray *array = NULL; GtkImage *img; GtkLabel *label; @@ -327,7 +327,6 @@ if (!ret) { g_warning ("failed to update gamma: %s", error->message); - g_error_free (error); goto out; } goto out; @@ -402,7 +401,7 @@ CdExamplePrivate *priv) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GdkEventWindowState *event_state = (GdkEventWindowState *) event; GtkWindow *window = GTK_WINDOW (widget); @@ -417,10 +416,8 @@ priv->device, &error); - if (!ret) { + if (!ret) g_warning ("Failed to resize window: %s", error->message); - g_error_free (error); - } return TRUE; } @@ -431,7 +428,7 @@ cd_example_button_start_cb (GtkWidget *widget, CdExamplePrivate *priv) { GVariant *retval; - GError *error = NULL; + g_autoptr(GError) error = NULL; /* continue */ retval = g_dbus_proxy_call_sync (priv->proxy, @@ -475,7 +472,7 @@ gchar *title = NULL; GDBusConnection *connection = NULL; gdouble gamma = 2.2f; - GError *error = NULL; + g_autoptr(GError) error = NULL; gint retval = EXIT_FAILURE; GOptionContext *context; GtkBox *box; @@ -698,7 +695,6 @@ g_print ("%s: %s\n", "Failed to calibrate", error->message); - g_error_free (error); } g_option_context_free (context); if (priv != NULL) { diff -Nru colord-1.2.12/contrib/session-helper/cd-main.c colord-1.3.2/contrib/session-helper/cd-main.c --- colord-1.2.12/contrib/session-helper/cd-main.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/contrib/session-helper/cd-main.c 2016-03-21 09:44:53.000000000 +0000 @@ -29,7 +29,6 @@ #include -#include "cd-cleanup.h" #include "cd-debug.h" #include "cd-state.h" #include "cd-session.h" @@ -158,7 +157,7 @@ CdColorRGB *color, GError **error) { - _cleanup_hashtable_unref_ GHashTable *hash = NULL; + g_autoptr(GHashTable) hash = NULL; /* emit signal */ g_debug ("CdMain: Emitting UpdateSample(%f,%f,%f)", @@ -356,7 +355,7 @@ CdColorXYZ *xyz, GError **error) { - CdColorXYZ *xyz_tmp; + g_autoptr(CdColorXYZ) xyz_tmp = NULL; xyz_tmp = cd_sensor_get_sample_sync (priv->sensor, priv->device_kind, @@ -365,7 +364,6 @@ if (xyz_tmp == NULL) return FALSE; cd_color_xyz_copy (xyz_tmp, xyz); - cd_color_xyz_free (xyz_tmp); return TRUE; } @@ -616,7 +614,7 @@ gboolean ret = TRUE; gdouble mix; guint i; - _cleanup_ptrarray_unref_ GPtrArray *old_array = NULL; + g_autoptr(GPtrArray) old_array = NULL; /* make a deep copy */ old_array = g_ptr_array_new_with_free_func (g_free); @@ -667,9 +665,9 @@ gdouble temp; guint i; guint precision_steps = 0; - _cleanup_string_free_ GString *error_str = NULL; - _cleanup_ptrarray_unref_ GPtrArray *gamma_data = NULL; - _cleanup_ptrarray_unref_ GPtrArray *vcgt_smoothed = NULL; + g_autoptr(GString) error_str = NULL; + g_autoptr(GPtrArray) gamma_data = NULL; + g_autoptr(GPtrArray) vcgt_smoothed = NULL; /* reset the state */ ret = cd_state_set_steps (state, @@ -859,8 +857,8 @@ cd_main_load_samples (CdMainPrivate *priv, GError **error) { const gchar *filename; - _cleanup_free_ gchar *path = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autofree gchar *path = NULL; + g_autoptr(GFile) file = NULL; filename = cd_main_get_display_ti1 (priv->quality); path = g_build_filename (DATADIR, @@ -881,11 +879,11 @@ cd_main_write_colprof_files (CdMainPrivate *priv, GError **error) { gboolean ret = TRUE; - _cleanup_free_ gchar *data_cal = NULL; - _cleanup_free_ gchar *data = NULL; - _cleanup_free_ gchar *data_ti3 = NULL; - _cleanup_free_ gchar *filename_ti3 = NULL; - _cleanup_free_ gchar *path_ti3 = NULL; + g_autofree gchar *data_cal = NULL; + g_autofree gchar *data = NULL; + g_autofree gchar *data_ti3 = NULL; + g_autofree gchar *filename_ti3 = NULL; + g_autofree gchar *path_ti3 = NULL; /* build temp path */ priv->working_path = g_dir_make_tmp ("colord-session-XXXXXX", error); @@ -976,9 +974,9 @@ cd_main_import_profile (CdMainPrivate *priv, GError **error) { gboolean ret = TRUE; - _cleanup_free_ gchar *filename = NULL; - _cleanup_free_ gchar *path = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autofree gchar *filename = NULL; + g_autofree gchar *path = NULL; + g_autoptr(GFile) file = NULL; filename = g_strdup_printf ("%s.icc", priv->basename); path = g_build_filename (priv->working_path, @@ -1026,11 +1024,11 @@ cd_main_set_profile_metadata (CdMainPrivate *priv, GError **error) { gboolean ret; - _cleanup_error_free_ GError *error_local = NULL; - _cleanup_free_ gchar *profile_fn = NULL; - _cleanup_free_ gchar *profile_path = NULL; - _cleanup_object_unref_ CdIcc *icc = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GError) error_local = NULL; + g_autofree gchar *profile_fn = NULL; + g_autofree gchar *profile_path = NULL; + g_autoptr(CdIcc) icc = NULL; + g_autoptr(GFile) file = NULL; /* get profile */ profile_fn = g_strdup_printf ("%s.icc", priv->basename); @@ -1075,7 +1073,7 @@ CD_PROFILE_METADATA_MEASUREMENT_DEVICE, cd_sensor_kind_to_string (cd_sensor_get_kind (priv->sensor))); if (priv->screen_brightness > 0) { - _cleanup_free_ gchar *brightness_str = NULL; + g_autofree gchar *brightness_str = NULL; brightness_str = g_strdup_printf ("%u", priv->screen_brightness); cd_icc_add_metadata (icc, CD_PROFILE_METADATA_SCREEN_BRIGHTNESS, @@ -1107,10 +1105,10 @@ { gboolean ret; gint exit_status = 0; - _cleanup_free_ gchar *cmd_debug = NULL; - _cleanup_free_ gchar *command = NULL; - _cleanup_free_ gchar *stderr_data = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autofree gchar *cmd_debug = NULL; + g_autofree gchar *command = NULL; + g_autofree gchar *stderr_data = NULL; + g_autoptr(GPtrArray) array = NULL; /* get correct name of the command */ command = cd_main_find_argyll_tool ("colprof", error); @@ -1278,7 +1276,7 @@ GCancellable *cancellable, GError **error) { - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GFile) file = NULL; g_debug ("removing %s", filename); file = g_file_new_for_path (filename); @@ -1294,7 +1292,7 @@ const gchar *filename; gboolean ret; gchar *src; - _cleanup_dir_close_ GDir *dir = NULL; + g_autoptr(GDir) dir = NULL; /* try to open */ dir = g_dir_open (priv->working_path, 0, error); @@ -1330,7 +1328,7 @@ { CdState *state_local; gboolean ret; - _cleanup_error_free_ GError *error_local = NULL; + g_autoptr(GError) error_local = NULL; /* reset the state */ ret = cd_state_set_steps (state, @@ -1395,7 +1393,7 @@ cd_main_start_calibration_cb (gpointer user_data) { CdMainPrivate *priv = (CdMainPrivate *) user_data; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* reset the state */ cd_state_reset (priv->state); @@ -1464,8 +1462,8 @@ GError **error) { gboolean ret; - _cleanup_error_free_ GError *error_local = NULL; - _cleanup_object_unref_ CdDevice *device_tmp = NULL; + g_autoptr(GError) error_local = NULL; + g_autoptr(CdDevice) device_tmp = NULL; device_tmp = cd_client_find_device_sync (priv->client, device_id, @@ -1476,7 +1474,7 @@ CD_SESSION_ERROR, CD_SESSION_ERROR_FAILED_TO_FIND_DEVICE, "%s", error_local->message); - return FALSE; + return NULL; } ret = cd_device_connect_sync (device_tmp, NULL, @@ -1486,7 +1484,7 @@ CD_SESSION_ERROR, CD_SESSION_ERROR_FAILED_TO_FIND_DEVICE, "%s", error_local->message); - return FALSE; + return NULL; } /* mark device to be profiled in colord */ @@ -1498,7 +1496,7 @@ CD_SESSION_ERROR, CD_SESSION_ERROR_INTERNAL, "%s", error_local->message); - return FALSE; + return NULL; } /* success */ @@ -1514,8 +1512,8 @@ GError **error) { gboolean ret; - _cleanup_error_free_ GError *error_local = NULL; - _cleanup_object_unref_ CdSensor *sensor_tmp = NULL; + g_autoptr(GError) error_local = NULL; + g_autoptr(CdSensor) sensor_tmp = NULL; sensor_tmp = cd_client_find_sensor_sync (priv->client, sensor_id, @@ -1526,7 +1524,7 @@ CD_SESSION_ERROR, CD_SESSION_ERROR_FAILED_TO_FIND_SENSOR, "%s", error_local->message); - return FALSE; + return NULL; } ret = cd_sensor_connect_sync (sensor_tmp, NULL, @@ -1536,7 +1534,7 @@ CD_SESSION_ERROR, CD_SESSION_ERROR_FAILED_TO_FIND_SENSOR, "%s", error_local->message); - return FALSE; + return NULL; } /* lock the sensor */ @@ -1548,7 +1546,7 @@ CD_SESSION_ERROR, CD_SESSION_ERROR_FAILED_TO_FIND_SENSOR, "%s", error_local->message); - return FALSE; + return NULL; } /* success */ @@ -1564,7 +1562,7 @@ const gchar *tmp; GDateTime *datetime; GString *str; - _cleanup_free_ gchar *date_str = NULL; + g_autofree gchar *date_str = NULL; str = g_string_new (""); @@ -1601,7 +1599,7 @@ g_string_set_size (str, str->len - 1); /* make suitable filename */ - g_strdelimit (str->str, "\"*?", '_'); + g_strdelimit (str->str, "/\"*?", '_'); priv->basename = g_string_free (str, FALSE); } @@ -1635,7 +1633,7 @@ const gchar *sensor_id; GVariantIter *iter = NULL; GVariant *prop_value; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* should be impossible */ if (g_strcmp0 (interface_name, "org.freedesktop.ColorHelper.Display") != 0) { @@ -1922,8 +1920,8 @@ static GDBusNodeInfo * cd_main_load_introspection (const gchar *filename, GError **error) { - _cleanup_free_ gchar *data = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autofree gchar *data = NULL; + g_autoptr(GFile) file = NULL; /* load file */ file = g_file_new_for_path (filename); @@ -1995,7 +1993,7 @@ "Exit after a small delay", NULL }, { NULL} }; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; setlocale (LC_ALL, ""); diff -Nru colord-1.2.12/contrib/session-helper/cd-state.c colord-1.3.2/contrib/session-helper/cd-state.c --- colord-1.2.12/contrib/session-helper/cd-state.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/contrib/session-helper/cd-state.c 2015-10-13 15:24:13.000000000 +0000 @@ -27,7 +27,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-state.h" #define CD_STATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_STATE, CdStatePrivate)) @@ -470,7 +469,7 @@ gdouble total_time = 0.0f; guint i; guint uncumalitive = 0; - _cleanup_string_free_ GString *result = NULL; + g_autoptr(GString) result = NULL; /* get the total time so we can work out the divisor */ for (i = 0; i < state->priv->steps; i++) diff -Nru colord-1.2.12/contrib/session-helper/colord-session.service.in colord-1.3.2/contrib/session-helper/colord-session.service.in --- colord-1.2.12/contrib/session-helper/colord-session.service.in 1970-01-01 00:00:00.000000000 +0000 +++ colord-1.3.2/contrib/session-helper/colord-session.service.in 2015-09-29 13:52:48.000000000 +0000 @@ -0,0 +1,7 @@ +[Unit] +Description=Color management helper + +[Service] +Type=dbus +BusName=org.freedesktop.ColorHelper +ExecStart=@servicedir@/colord-session diff -Nru colord-1.2.12/contrib/session-helper/Makefile.am colord-1.3.2/contrib/session-helper/Makefile.am --- colord-1.2.12/contrib/session-helper/Makefile.am 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/contrib/session-helper/Makefile.am 2015-09-29 13:52:48.000000000 +0000 @@ -62,6 +62,12 @@ @sed -e "s|\@servicedir\@|$(libexecdir)|" $< | \ sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ +systemduserdir = $(prefix)/lib/systemd/user +systemduser_in_files = colord-session.service.in +systemduser_DATA = $(systemduser_in_files:.service.in=.service) +$(systemduser_DATA): $(systemduser_in_files) Makefile + @sed -e "s|\@servicedir\@|$(libexecdir)|" $< > $@ + if CD_BUILD_SESSION_EXAMPLE noinst_PROGRAMS = \ colord-session-example @@ -93,10 +99,12 @@ EXTRA_DIST = \ $(gsettings_schemas_in_files) \ + $(systemduser_in_files) \ $(dbusservicemain_in_files) DISTCLEANFILES = \ $(dbusservicemain_DATA) \ + $(systemduser_DATA) \ org.freedesktop.ColorHelper.gschema.xml -include $(top_srcdir)/git.mk diff -Nru colord-1.2.12/contrib/session-helper/Makefile.in colord-1.3.2/contrib/session-helper/Makefile.in --- colord-1.2.12/contrib/session-helper/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/contrib/session-helper/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -117,7 +117,7 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(libexecdir)" \ "$(DESTDIR)$(dbusservicemaindir)" \ - "$(DESTDIR)$(introspectiondir)" \ + "$(DESTDIR)$(introspectiondir)" "$(DESTDIR)$(systemduserdir)" \ "$(DESTDIR)$(libcolord_includedir)" PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS) am_colord_session_OBJECTS = colord_session-cd-debug.$(OBJEXT) \ @@ -217,7 +217,8 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -DATA = $(dbusservicemain_DATA) $(dist_introspection_DATA) +DATA = $(dbusservicemain_DATA) $(dist_introspection_DATA) \ + $(systemduser_DATA) HEADERS = $(libcolord_include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -352,6 +353,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -456,6 +458,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -517,6 +520,9 @@ dbusservicemaindir = $(datadir)/dbus-1/services dbusservicemain_in_files = org.freedesktop.ColorHelper.service.in dbusservicemain_DATA = $(dbusservicemain_in_files:.service.in=.service) +systemduserdir = $(prefix)/lib/systemd/user +systemduser_in_files = colord-session.service.in +systemduser_DATA = $(systemduser_in_files:.service.in=.service) @CD_BUILD_SESSION_EXAMPLE_TRUE@colord_session_example_SOURCES = \ @CD_BUILD_SESSION_EXAMPLE_TRUE@ cd-example.c @@ -534,10 +540,12 @@ gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml) EXTRA_DIST = \ $(gsettings_schemas_in_files) \ + $(systemduser_in_files) \ $(dbusservicemain_in_files) DISTCLEANFILES = \ $(dbusservicemain_DATA) \ + $(systemduser_DATA) \ org.freedesktop.ColorHelper.gschema.xml all: all-am @@ -775,6 +783,27 @@ @list='$(dist_introspection_DATA)'; test -n "$(introspectiondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(introspectiondir)'; $(am__uninstall_files_from_dir) +install-systemduserDATA: $(systemduser_DATA) + @$(NORMAL_INSTALL) + @list='$(systemduser_DATA)'; test -n "$(systemduserdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(systemduserdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(systemduserdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemduserdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(systemduserdir)" || exit $$?; \ + done + +uninstall-systemduserDATA: + @$(NORMAL_UNINSTALL) + @list='$(systemduser_DATA)'; test -n "$(systemduserdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(systemduserdir)'; $(am__uninstall_files_from_dir) install-libcolord_includeHEADERS: $(libcolord_include_HEADERS) @$(NORMAL_INSTALL) @list='$(libcolord_include_HEADERS)'; test -n "$(libcolord_includedir)" || list=; \ @@ -883,7 +912,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(dbusservicemaindir)" "$(DESTDIR)$(introspectiondir)" "$(DESTDIR)$(libcolord_includedir)"; do \ + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(dbusservicemaindir)" "$(DESTDIR)$(introspectiondir)" "$(DESTDIR)$(systemduserdir)" "$(DESTDIR)$(libcolord_includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -942,7 +971,7 @@ install-data-am: install-dbusservicemainDATA \ install-dist_introspectionDATA \ - install-libcolord_includeHEADERS + install-libcolord_includeHEADERS install-systemduserDATA install-dvi: install-dvi-am @@ -990,7 +1019,8 @@ uninstall-am: uninstall-dbusservicemainDATA \ uninstall-dist_introspectionDATA \ - uninstall-libcolord_includeHEADERS uninstall-libexecPROGRAMS + uninstall-libcolord_includeHEADERS uninstall-libexecPROGRAMS \ + uninstall-systemduserDATA .MAKE: install-am install-strip @@ -1004,19 +1034,22 @@ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-libcolord_includeHEADERS \ install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-ps install-ps-am install-strip install-systemduserDATA \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am \ uninstall-dbusservicemainDATA uninstall-dist_introspectionDATA \ - uninstall-libcolord_includeHEADERS uninstall-libexecPROGRAMS + uninstall-libcolord_includeHEADERS uninstall-libexecPROGRAMS \ + uninstall-systemduserDATA .PRECIOUS: Makefile $(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile @sed -e "s|\@servicedir\@|$(libexecdir)|" $< | \ sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ +$(systemduser_DATA): $(systemduser_in_files) Makefile + @sed -e "s|\@servicedir\@|$(libexecdir)|" $< > $@ @CD_BUILD_SESSION_EXAMPLE_TRUE@test: colord-session-example @CD_BUILD_SESSION_EXAMPLE_TRUE@ ./colord-session-example \ diff -Nru colord-1.2.12/contrib/session-helper/org.freedesktop.ColorHelper.service.in colord-1.3.2/contrib/session-helper/org.freedesktop.ColorHelper.service.in --- colord-1.2.12/contrib/session-helper/org.freedesktop.ColorHelper.service.in 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/contrib/session-helper/org.freedesktop.ColorHelper.service.in 2015-09-29 13:52:48.000000000 +0000 @@ -1,3 +1,4 @@ [D-BUS Service] Name=org.freedesktop.ColorHelper Exec=@servicedir@/colord-session +SystemdService=colord-session.service diff -Nru colord-1.2.12/data/cmf/Makefile.in colord-1.3.2/data/cmf/Makefile.in --- colord-1.2.12/data/cmf/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/data/cmf/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -273,6 +273,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -377,6 +378,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/data/colord.conf colord-1.3.2/data/colord.conf --- colord-1.2.12/data/colord.conf 1970-01-01 00:00:00.000000000 +0000 +++ colord-1.3.2/data/colord.conf 2015-10-02 08:00:49.000000000 +0000 @@ -0,0 +1,2 @@ +d /var/lib/colord 0755 colord colord +d /var/lib/colord/icc 0755 colord colord diff -Nru colord-1.2.12/data/figures/Makefile.in colord-1.3.2/data/figures/Makefile.in --- colord-1.2.12/data/figures/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/data/figures/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -273,6 +273,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -377,6 +378,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/data/illuminant/Makefile.in colord-1.3.2/data/illuminant/Makefile.in --- colord-1.2.12/data/illuminant/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/data/illuminant/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -273,6 +273,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -377,6 +378,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/data/Makefile.am colord-1.3.2/data/Makefile.am --- colord-1.2.12/data/Makefile.am 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/data/Makefile.am 2016-02-17 13:31:21.000000000 +0000 @@ -8,7 +8,7 @@ tests \ ti1 -if HAVE_UNIX +if HAVE_DAEMON dbusdir = $(sysconfdir)/dbus-1/system.d dist_dbus_DATA = org.freedesktop.ColorManager.conf @@ -20,6 +20,9 @@ sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ systemdservicemain_in_files = colord.service.in + +dist_tmpfiles_DATA = colord.conf + endif if HAVE_SYSTEMD diff -Nru colord-1.2.12/data/Makefile.in colord-1.3.2/data/Makefile.in --- colord-1.2.12/data/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/data/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -108,7 +108,8 @@ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am \ $(am__dist_bashcompletion_DATA_DIST) \ - $(am__dist_dbus_DATA_DIST) $(am__DIST_COMMON) + $(am__dist_dbus_DATA_DIST) $(am__dist_tmpfiles_DATA_DIST) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = org.freedesktop.ColorManager.conf @@ -169,11 +170,14 @@ } am__installdirs = "$(DESTDIR)$(dbusservicemaindir)" \ "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(dbusdir)" \ + "$(DESTDIR)$(tmpfilesdir)" \ "$(DESTDIR)$(systemdservicemaindir)" am__dist_bashcompletion_DATA_DIST = colormgr am__dist_dbus_DATA_DIST = org.freedesktop.ColorManager.conf +am__dist_tmpfiles_DATA_DIST = colord.conf DATA = $(dbusservicemain_DATA) $(dist_bashcompletion_DATA) \ - $(dist_dbus_DATA) $(systemdservicemain_DATA) + $(dist_dbus_DATA) $(dist_tmpfiles_DATA) \ + $(systemdservicemain_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -342,6 +346,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -446,6 +451,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -459,12 +465,13 @@ tests \ ti1 -@HAVE_UNIX_TRUE@dbusdir = $(sysconfdir)/dbus-1/system.d -@HAVE_UNIX_TRUE@dist_dbus_DATA = org.freedesktop.ColorManager.conf -@HAVE_UNIX_TRUE@dbusservicemaindir = $(datadir)/dbus-1/system-services -@HAVE_UNIX_TRUE@dbusservicemain_in_files = org.freedesktop.ColorManager.service.in -@HAVE_UNIX_TRUE@dbusservicemain_DATA = $(dbusservicemain_in_files:.service.in=.service) -@HAVE_UNIX_TRUE@systemdservicemain_in_files = colord.service.in +@HAVE_DAEMON_TRUE@dbusdir = $(sysconfdir)/dbus-1/system.d +@HAVE_DAEMON_TRUE@dist_dbus_DATA = org.freedesktop.ColorManager.conf +@HAVE_DAEMON_TRUE@dbusservicemaindir = $(datadir)/dbus-1/system-services +@HAVE_DAEMON_TRUE@dbusservicemain_in_files = org.freedesktop.ColorManager.service.in +@HAVE_DAEMON_TRUE@dbusservicemain_DATA = $(dbusservicemain_in_files:.service.in=.service) +@HAVE_DAEMON_TRUE@systemdservicemain_in_files = colord.service.in +@HAVE_DAEMON_TRUE@dist_tmpfiles_DATA = colord.conf @HAVE_SYSTEMD_TRUE@systemdservicemaindir = $(systemdsystemunitdir) @HAVE_SYSTEMD_TRUE@systemdservicemain_DATA = $(systemdservicemain_in_files:.service.in=.service) EXTRA_DIST = $(dbusservicemain_in_files) \ @@ -581,6 +588,27 @@ @list='$(dist_dbus_DATA)'; test -n "$(dbusdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dbusdir)'; $(am__uninstall_files_from_dir) +install-dist_tmpfilesDATA: $(dist_tmpfiles_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_tmpfiles_DATA)'; test -n "$(tmpfilesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tmpfilesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tmpfilesdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tmpfilesdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(tmpfilesdir)" || exit $$?; \ + done + +uninstall-dist_tmpfilesDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_tmpfiles_DATA)'; test -n "$(tmpfilesdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(tmpfilesdir)'; $(am__uninstall_files_from_dir) install-systemdservicemainDATA: $(systemdservicemain_DATA) @$(NORMAL_INSTALL) @list='$(systemdservicemain_DATA)'; test -n "$(systemdservicemaindir)" || list=; \ @@ -762,7 +790,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(dbusservicemaindir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(systemdservicemaindir)"; do \ + for dir in "$(DESTDIR)$(dbusservicemaindir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(tmpfilesdir)" "$(DESTDIR)$(systemdservicemaindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -819,7 +847,7 @@ install-data-am: install-dbusservicemainDATA \ install-dist_bashcompletionDATA install-dist_dbusDATA \ - install-systemdservicemainDATA + install-dist_tmpfilesDATA install-systemdservicemainDATA install-dvi: install-dvi-recursive @@ -865,7 +893,7 @@ uninstall-am: uninstall-dbusservicemainDATA \ uninstall-dist_bashcompletionDATA uninstall-dist_dbusDATA \ - uninstall-systemdservicemainDATA + uninstall-dist_tmpfilesDATA uninstall-systemdservicemainDATA .MAKE: $(am__recursive_targets) install-am install-strip @@ -875,23 +903,23 @@ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ install-dbusservicemainDATA install-dist_bashcompletionDATA \ - install-dist_dbusDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip \ - install-systemdservicemainDATA installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + install-dist_dbusDATA install-dist_tmpfilesDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-systemdservicemainDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-dbusservicemainDATA \ uninstall-dist_bashcompletionDATA uninstall-dist_dbusDATA \ - uninstall-systemdservicemainDATA + uninstall-dist_tmpfilesDATA uninstall-systemdservicemainDATA .PRECIOUS: Makefile -@HAVE_UNIX_TRUE@$(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile -@HAVE_UNIX_TRUE@ @sed -e "s|\@servicedir\@|$(libexecdir)|" $< | \ -@HAVE_UNIX_TRUE@ sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ +@HAVE_DAEMON_TRUE@$(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile +@HAVE_DAEMON_TRUE@ @sed -e "s|\@servicedir\@|$(libexecdir)|" $< | \ +@HAVE_DAEMON_TRUE@ sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ @HAVE_SYSTEMD_TRUE@$(systemdservicemain_DATA): $(systemdservicemain_in_files) Makefile @HAVE_SYSTEMD_TRUE@ @sed -e "s|\@servicedir\@|$(libexecdir)|" $< | \ @HAVE_SYSTEMD_TRUE@ sed -e "s|\@daemon_user\@|$(daemon_user)|" > $@ diff -Nru colord-1.2.12/data/profiles/Makefile.am colord-1.3.2/data/profiles/Makefile.am --- colord-1.2.12/data/profiles/Makefile.am 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/data/profiles/Makefile.am 2015-10-27 10:16:08.000000000 +0000 @@ -31,7 +31,7 @@ NTSC-RGB.xml \ PAL-RGB.xml \ ProPhotoRGB.xml \ - Rec709.xml.in \ + Rec709.xml \ SMPTE-C-RGB.xml \ SNAP_TR002_newsprint.xml \ sRGB.xml \ diff -Nru colord-1.2.12/data/profiles/Makefile.in colord-1.3.2/data/profiles/Makefile.in --- colord-1.2.12/data/profiles/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/data/profiles/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -288,6 +288,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -392,6 +393,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -426,7 +428,7 @@ NTSC-RGB.xml \ PAL-RGB.xml \ ProPhotoRGB.xml \ - Rec709.xml.in \ + Rec709.xml \ SMPTE-C-RGB.xml \ SNAP_TR002_newsprint.xml \ sRGB.xml \ diff -Nru colord-1.2.12/data/ref/Makefile.in colord-1.3.2/data/ref/Makefile.in --- colord-1.2.12/data/ref/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/data/ref/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -274,6 +274,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -378,6 +379,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/data/tests/Makefile.in colord-1.3.2/data/tests/Makefile.in --- colord-1.2.12/data/tests/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/data/tests/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -273,6 +273,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -377,6 +378,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/data/ti1/Makefile.in colord-1.3.2/data/ti1/Makefile.in --- colord-1.2.12/data/ti1/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/data/ti1/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -273,6 +273,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -377,6 +378,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/debian/changelog colord-1.3.2/debian/changelog --- colord-1.2.12/debian/changelog 2015-11-06 17:19:42.000000000 +0000 +++ colord-1.3.2/debian/changelog 2016-04-20 21:06:56.000000000 +0000 @@ -1,10 +1,17 @@ -colord (1.2.12-1ubuntu1) xenial; urgency=medium +colord (1.3.2-1) unstable; urgency=medium - * Merge from Debian unstable. Remaining Ubuntu changes: - + debian/control: Don't build-depend on Argyll; not in main. - + debian/rules: Don't build extra print profiles; requires Argyll + * New upstream 1.3.2 release (Closes: 815252) + * Add new symbols to libcolord2.symbols + * Install systemd user service and tmpfiles.d snippets + * Install new OceanOptics Spark sensor driver + * Demote colord to a Suggests of libcolord2 (Closes: 780625) + * Add new symbols to libcolorhug2 + * Bump Standards-Version; no changes required. + * Retrospectively wrap 1.2.12-1's changelog to 80 characters. + * Cherry-pick 5256a116: + libcolord: Fix an assert failure when connecting to sensors. - -- Christopher James Halse Rogers Fri, 06 Nov 2015 17:19:36 +0000 + -- Christopher James Halse Rogers Tue, 19 Apr 2016 17:27:34 +1000 colord (1.2.12-1) unstable; urgency=medium @@ -20,8 +27,8 @@ * Update libcolorhug symbols for 1.2.12 release * Really, truly, remove obsolete colord.conf. (Closes: 751212) * colord-plugin-argyll: fix upgrade from Jessie. - This package was split out of colord as argyll has become Linux-only, so we need - to do the Breaks/Replaces dance. (Closes: 798355) + This package was split out of colord as argyll has become Linux-only, so + we need to do the Breaks/Replaces dance. (Closes: 798355) -- Christopher James Halse Rogers Fri, 06 Nov 2015 10:51:38 -0600 @@ -43,22 +50,6 @@ -- Christopher James Halse Rogers Thu, 13 Aug 2015 08:56:11 +0200 -colord (1.2.8-0ubuntu1) vivid; urgency=medium - - * Pseudo-merge from unreleased Debian package. Remaining Ubuntu changes: - + Don't Build-Depend on argyll; not in main. - + Don't build extra print profiles; requires argyll. - * New upstream 1.2.8 release. - * Remove no-longer-used colord.conf (Closes: 751212) - * Add new symbols to libcolord-private symbols file - * Add new functions to libcolorhug2 symbols file - * Add newly-introduced symbols to symbols file - * Update DEP8 control for libtool-bin split - * Output better logs on DEP8 failures - * Add colord-sensor-argyll package - - -- Christopher James Halse Rogers Thu, 19 Feb 2015 14:39:00 +1100 - colord (1.2.1-1) unstable; urgency=medium * New upstream stable release. Fixes unsafe pointer cast, so diff -Nru colord-1.2.12/debian/colord.install colord-1.3.2/debian/colord.install --- colord-1.2.12/debian/colord.install 2015-11-06 17:14:20.000000000 +0000 +++ colord-1.3.2/debian/colord.install 2016-04-20 21:06:56.000000000 +0000 @@ -9,3 +9,5 @@ usr/share/polkit-1 usr/share/bash-completion lib/systemd/system/*.service +usr/lib/systemd/user/ +usr/lib/tmpfiles.d/ diff -Nru colord-1.2.12/debian/colord.install.linux colord-1.3.2/debian/colord.install.linux --- colord-1.2.12/debian/colord.install.linux 2015-11-06 17:14:20.000000000 +0000 +++ colord-1.3.2/debian/colord.install.linux 2016-04-20 21:06:56.000000000 +0000 @@ -8,9 +8,12 @@ usr/lib/*/colord-sensors/libcolord_sensor_dtp94.so usr/lib/*/colord-sensors/libcolord_sensor_dummy.so usr/lib/*/colord-sensors/libcolord_sensor_huey.so +usr/lib/*/colord-sensors/libcolord_sensor_spark.so usr/share/glib-2.0/schemas usr/share/dbus-1 usr/share/man usr/share/polkit-1 usr/share/bash-completion lib/systemd/system/*.service +usr/lib/systemd/user/ +usr/lib/tmpfiles.d/ diff -Nru colord-1.2.12/debian/control colord-1.3.2/debian/control --- colord-1.2.12/debian/control 2015-11-06 17:15:00.000000000 +0000 +++ colord-1.3.2/debian/control 2016-04-20 21:06:56.000000000 +0000 @@ -24,7 +24,9 @@ libsystemd-dev [linux-any], bash-completion, dh-systemd (>= 1.4), -Standards-Version: 3.9.6 +Build-Depends-Indep: + argyll [linux-any], +Standards-Version: 3.9.8 Section: graphics Homepage: http://www.freedesktop.org/software/colord/ Vcs-Git: git://anonscm.debian.org/collab-maint/colord.git @@ -56,7 +58,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, -Recommends: colord +Suggests: colord Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: system service to manage device colour profiles -- runtime diff -Nru colord-1.2.12/debian/libcolord2.symbols colord-1.3.2/debian/libcolord2.symbols --- colord-1.2.12/debian/libcolord2.symbols 2015-06-15 02:56:12.000000000 +0000 +++ colord-1.3.2/debian/libcolord2.symbols 2016-04-20 21:06:56.000000000 +0000 @@ -185,6 +185,9 @@ cd_sensor_get_sample_finish@Base 0.1.10 cd_sensor_get_sample_sync@Base 0.1.10 cd_sensor_get_serial@Base 0.1.10 + cd_sensor_get_spectrum@Base 1.3.1 + cd_sensor_get_spectrum_finish@Base 1.3.1 + cd_sensor_get_spectrum_sync@Base 1.3.1 cd_sensor_get_state@Base 0.1.10 cd_sensor_get_type@Base 0.1.10 cd_sensor_get_vendor@Base 0.1.10 @@ -491,20 +494,30 @@ cd_spectrum_get_type@Base 1.2.0 cd_spectrum_get_value@Base 1.2.0 cd_spectrum_get_value_for_nm@Base 1.2.0 + cd_spectrum_get_value_max@Base 1.3.1 + cd_spectrum_get_value_min@Base 1.3.1 cd_spectrum_get_value_raw@Base 1.2.8 cd_spectrum_get_wavelength@Base 1.2.0 + cd_spectrum_get_wavelength_cal@Base 1.3.1 + cd_spectrum_limit_max@Base 1.3.1 + cd_spectrum_limit_min@Base 1.3.1 cd_spectrum_multiply@Base 1.2.0 cd_spectrum_new@Base 1.2.0 cd_spectrum_normalize@Base 1.2.0 cd_spectrum_normalize_max@Base 1.2.8 cd_spectrum_planckian_new@Base 1.2.0 + cd_spectrum_planckian_new_full@Base 1.3.1 + cd_spectrum_resample@Base 1.3.1 cd_spectrum_set_data@Base 1.2.0 cd_spectrum_set_end@Base 1.2.0 cd_spectrum_set_id@Base 1.2.0 cd_spectrum_set_norm@Base 1.2.0 cd_spectrum_set_start@Base 1.2.0 cd_spectrum_set_value@Base 1.2.8 + cd_spectrum_set_wavelength_cal@Base 1.3.1 cd_spectrum_sized_new@Base 1.2.0 + cd_spectrum_subtract@Base 1.3.1 + cd_spectrum_to_string@Base 1.3.1 cd_standard_space_from_string@Base 0.1.29 cd_standard_space_to_string@Base 0.1.29 cd_transform_error_quark@Base 0.1.34 diff -Nru colord-1.2.12/debian/libcolorhug2.symbols colord-1.3.2/debian/libcolorhug2.symbols --- colord-1.2.12/debian/libcolorhug2.symbols 2015-11-06 17:14:20.000000000 +0000 +++ colord-1.3.2/debian/libcolorhug2.symbols 2016-04-20 21:06:56.000000000 +0000 @@ -4,13 +4,22 @@ ch_device_check_firmware@Base 1.2.4 ch_device_close@Base 1.2.11 ch_device_error_quark@Base 0.1.30 + ch_device_get_ccd_calibration@Base 1.3.2 + ch_device_get_error@Base 1.3.2 ch_device_get_guid@Base 1.2.10 + ch_device_get_integral_time@Base 1.3.2 + ch_device_get_leds@Base 1.3.2 ch_device_get_mode@Base 0.1.30 + ch_device_get_pcb_errata@Base 1.3.2 ch_device_get_runcode_address@Base 1.2.10 + ch_device_get_serial_number@Base 1.3.2 + ch_device_get_spectrum@Base 1.3.2 + ch_device_get_temperature@Base 1.3.2 ch_device_is_colorhug@Base 0.1.30 ch_device_mode_from_firmware@Base 1.2.4 ch_device_mode_to_string@Base 0.1.30 ch_device_open@Base 0.1.30 + ch_device_open_full@Base 1.3.2 ch_device_queue_add@Base 0.1.30 ch_device_queue_boot_flash@Base 0.1.30 ch_device_queue_clear_calibration@Base 0.1.30 @@ -77,6 +86,15 @@ ch_device_queue_write_firmware@Base 0.1.30 ch_device_queue_write_flash@Base 0.1.30 ch_device_queue_write_sram@Base 0.1.30 + ch_device_self_test@Base 1.3.2 + ch_device_set_ccd_calibration@Base 1.3.2 + ch_device_set_crypto_key@Base 1.3.2 + ch_device_set_integral_time@Base 1.3.2 + ch_device_set_leds@Base 1.3.2 + ch_device_set_pcb_errata@Base 1.3.2 + ch_device_set_serial_number@Base 1.3.2 + ch_device_take_reading_spectral@Base 1.3.2 + ch_device_take_reading_xyz@Base 1.3.2 ch_device_write_command@Base 0.1.30 ch_device_write_command_async@Base 0.1.30 ch_device_write_command_finish@Base 0.1.30 diff -Nru colord-1.2.12/debian/patches/debian-changes colord-1.3.2/debian/patches/debian-changes --- colord-1.2.12/debian/patches/debian-changes 1970-01-01 00:00:00.000000000 +0000 +++ colord-1.3.2/debian/patches/debian-changes 2016-04-20 21:56:29.000000000 +0000 @@ -0,0 +1,80 @@ +These are patches cherry-picked from upstream - gitorious.org:colord/master.git +They are applied inline, rather than as separate patches, so that they +automatically go away once the upstream release containing them is merged in. +--- colord-1.3.2.orig/lib/colord/cd-device.c ++++ colord-1.3.2/lib/colord/cd-device.c +@@ -2235,7 +2235,6 @@ cd_device_finalize (GObject *object) + { + CdDevice *device = CD_DEVICE (object); + CdDevicePrivate *priv = GET_PRIVATE (device); +- guint ret; + + g_return_if_fail (CD_IS_DEVICE (object)); + +@@ -2249,17 +2248,8 @@ cd_device_finalize (GObject *object) + g_free (priv->vendor); + g_strfreev (priv->profiling_inhibitors); + g_ptr_array_unref (priv->profiles); +- if (priv->proxy != NULL) { +- ret = g_signal_handlers_disconnect_by_func (priv->proxy, +- G_CALLBACK (cd_device_dbus_signal_cb), +- device); +-// g_assert (ret > 0); +- ret = g_signal_handlers_disconnect_by_func (priv->proxy, +- G_CALLBACK (cd_device_dbus_properties_changed_cb), +- device); +-// g_assert (ret > 0); ++ if (priv->proxy != NULL) + g_object_unref (priv->proxy); +- } + + G_OBJECT_CLASS (cd_device_parent_class)->finalize (object); + } +--- colord-1.3.2.orig/lib/colord/cd-profile.c ++++ colord-1.3.2/lib/colord/cd-profile.c +@@ -1489,15 +1489,8 @@ cd_profile_finalize (GObject *object) + g_free (priv->format); + g_free (priv->title); + g_strfreev (priv->warnings); +- if (priv->proxy != NULL) { +- g_signal_handlers_disconnect_by_func (priv->proxy, +- G_CALLBACK (cd_profile_dbus_signal_cb), +- profile); +- g_signal_handlers_disconnect_by_func (priv->proxy, +- G_CALLBACK (cd_profile_dbus_properties_changed_cb), +- profile); ++ if (priv->proxy != NULL) + g_object_unref (priv->proxy); +- } + + G_OBJECT_CLASS (cd_profile_parent_class)->finalize (object); + } +--- colord-1.3.2.orig/lib/colord/cd-sensor.c ++++ colord-1.3.2/lib/colord/cd-sensor.c +@@ -1612,7 +1612,6 @@ cd_sensor_finalize (GObject *object) + { + CdSensor *sensor = CD_SENSOR (object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); +- guint ret; + + g_return_if_fail (CD_IS_SENSOR (object)); + +@@ -1623,17 +1622,8 @@ cd_sensor_finalize (GObject *object) + g_free (priv->vendor); + g_hash_table_unref (priv->options); + g_hash_table_destroy (priv->metadata); +- if (priv->proxy != NULL) { +- ret = g_signal_handlers_disconnect_by_func (priv->proxy, +- G_CALLBACK (cd_sensor_dbus_signal_cb), +- sensor); +- g_assert (ret > 0); +- ret = g_signal_handlers_disconnect_by_func (priv->proxy, +- G_CALLBACK (cd_sensor_dbus_properties_changed_cb), +- sensor); +- g_assert (ret > 0); ++ if (priv->proxy != NULL) + g_object_unref (priv->proxy); +- } + + G_OBJECT_CLASS (cd_sensor_parent_class)->finalize (object); + } diff -Nru colord-1.2.12/debian/patches/series colord-1.3.2/debian/patches/series --- colord-1.2.12/debian/patches/series 2015-09-08 07:53:26.000000000 +0000 +++ colord-1.3.2/debian/patches/series 2016-04-20 21:56:29.000000000 +0000 @@ -1 +1,2 @@ +debian-changes diff -Nru colord-1.2.12/debian/rules colord-1.3.2/debian/rules --- colord-1.2.12/debian/rules 2015-11-06 17:14:51.000000000 +0000 +++ colord-1.3.2/debian/rules 2016-04-20 21:06:56.000000000 +0000 @@ -36,8 +36,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux) confflags += --enable-sane --enable-gusb --enable-systemd-login --enable-udev -# indep_flags = --enable-print-profiles - indep_flags = --disable-print-profiles + indep_flags = --enable-print-profiles else confflags += --disable-sane --disable-gusb --disable-systemd-login --disable-udev indep_flags = --disable-print-profiles diff -Nru colord-1.2.12/doc/api/dbus/Makefile.in colord-1.3.2/doc/api/dbus/Makefile.in --- colord-1.2.12/doc/api/dbus/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/doc/api/dbus/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -243,6 +243,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -347,6 +348,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/doc/api/html/CdEdid.html colord-1.3.2/doc/api/html/CdEdid.html --- colord-1.2.12/doc/api/html/CdEdid.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/CdEdid.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -42,7 +42,7 @@ -GQuark +GQuark cd_edid_error_quark () @@ -66,49 +66,49 @@ -gboolean +gboolean cd_edid_parse () -const gchar * +const gchar * cd_edid_get_monitor_name () -const gchar * +const gchar * cd_edid_get_vendor_name () -const gchar * +const gchar * cd_edid_get_serial_number () -const gchar * +const gchar * cd_edid_get_eisa_id () -const gchar * +const gchar * cd_edid_get_checksum () -const gchar * +const gchar * cd_edid_get_pnp_id () @@ -116,7 +116,7 @@ -guint +guint cd_edid_get_width () @@ -124,7 +124,7 @@ -guint +guint cd_edid_get_height () @@ -132,7 +132,7 @@ -gdouble +gdouble cd_edid_get_gamma () @@ -184,7 +184,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── CdEdid
@@ -197,15 +197,14 @@

Functions

cd_edid_error_quark ()

-
GQuark
+
GQuark
 cd_edid_error_quark (void);

 
Gets the CdEdid error quark.

 

-
Returns

-
 a GQuark

-

+
Returns

+
 a GQuark

 

-
Since 1.1.2

+
Since: 1.1.2
@@ -214,11 +213,10 @@ cd_edid_new (void);

Creates an object suitable for parsing an EDID.

-

Returns

+

Returns

A new CdEdid

-

-

Since 1.1.2

+

Since: 1.1.2

@@ -227,7 +225,7 @@ cd_edid_reset (CdEdid *edid);

Resets all cached data.

-

Parameters

+

Parameters

@@ -241,18 +239,18 @@
-

Since 1.1.2

+

Since: 1.1.2

cd_edid_parse ()

-
gboolean
+
gboolean
 cd_edid_parse (CdEdid *edid,
-               GBytes *edid_data,
-               GError **error);

+               GBytes *edid_data,
+               GError **error);

Parses the EDID.

-

Parameters

+

Parameters

@@ -272,27 +270,26 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

-

TRUE for success

-

+

Returns

+

TRUE for success

-

Since 1.1.2

+

Since: 1.1.2

cd_edid_get_monitor_name ()

-
const gchar *
+
const gchar *
 cd_edid_get_monitor_name (CdEdid *edid);

 
Gets the EDID monitor name.

 

-
Parameters

+
Parameters

 
@@ -307,20 +304,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string value

-

 

-
Since 1.1.2

+
Since: 1.1.2

cd_edid_get_vendor_name ()

-
const gchar *
+
const gchar *
 cd_edid_get_vendor_name (CdEdid *edid);

 
Gets the EDID vendor name.

 

-
Parameters

+
Parameters

 
@@ -335,20 +331,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string value

-

 

-
Since 1.1.2

+
Since: 1.1.2

cd_edid_get_serial_number ()

-
const gchar *
+
const gchar *
 cd_edid_get_serial_number (CdEdid *edid);

 
Gets the EDID serial number.

 

-
Parameters

+
Parameters

 
@@ -363,20 +358,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string value

-

 

-
Since 1.1.2

+
Since: 1.1.2

cd_edid_get_eisa_id ()

-
const gchar *
+
const gchar *
 cd_edid_get_eisa_id (CdEdid *edid);

 
Gets the EDID EISA ID.

 

-
Parameters

+
Parameters

 
@@ -391,20 +385,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string value

-

 

-
Since 1.1.2

+
Since: 1.1.2

cd_edid_get_checksum ()

-
const gchar *
+
const gchar *
 cd_edid_get_checksum (CdEdid *edid);

 
Gets the EDID MD5 checksum.

 

-
Parameters

+
Parameters

 
@@ -419,20 +412,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string value

-

 

-
Since 1.1.2

+
Since: 1.1.2

cd_edid_get_pnp_id ()

-
const gchar *
+
const gchar *
 cd_edid_get_pnp_id (CdEdid *edid);

 
Gets the EDID PNP ID.

 

-
Parameters

+
Parameters

 
@@ -447,20 +439,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string value

-

 

-
Since 1.1.2

+
Since: 1.1.2

cd_edid_get_width ()

-
guint
+
guint
 cd_edid_get_width (CdEdid *edid);

 
Gets the panel width in inches.

 

-
Parameters

+
Parameters

 
@@ -475,20 +466,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 integer value

-

 

-
Since 1.1.2

+
Since: 1.1.2

cd_edid_get_height ()

-
guint
+
guint
 cd_edid_get_height (CdEdid *edid);

 
Gets the panel height in inches.

 

-
Parameters

+
Parameters

 
@@ -503,20 +493,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 integer value

-

 

-
Since 1.1.2

+
Since: 1.1.2

cd_edid_get_gamma ()

-
gdouble
+
gdouble
 cd_edid_get_gamma (CdEdid *edid);

 
Gets the native panel gamma.

 

-
Parameters

+
Parameters

 
@@ -531,11 +520,10 @@
 

 
 


 

 

-
Returns

+
Returns

 
 floating point value

-

 

-
Since 1.1.2

+
Since: 1.1.2
@@ -544,7 +532,7 @@ cd_edid_get_red (CdEdid *edid);

Gets the red primary.

-

Parameters

+

Parameters

@@ -559,11 +547,10 @@
-

Returns

-

TRUE for success

-

+

Returns

+

TRUE for success

-

Since 1.1.2

+

Since: 1.1.2

@@ -572,7 +559,7 @@ cd_edid_get_green (CdEdid *edid);

Gets the green primary.

-

Parameters

+

Parameters

@@ -587,11 +574,10 @@
-

Returns

+

Returns

CdColorYxy chromaticity

-

-

Since 1.1.2

+

Since: 1.1.2

@@ -600,7 +586,7 @@ cd_edid_get_blue (CdEdid *edid);

Gets the blue primary.

-

Parameters

+

Parameters

@@ -615,11 +601,10 @@
-

Returns

+

Returns

CdColorYxy chromaticity

-

-

Since 1.1.2

+

Since: 1.1.2

@@ -628,7 +613,7 @@ cd_edid_get_white (CdEdid *edid);

Gets the whitepoint.

-

Parameters

+

Parameters

@@ -643,11 +628,10 @@
-

Returns

+

Returns

CdColorYxy chromaticity

-

-

Since 1.1.2

+

Since: 1.1.2

@@ -662,6 +646,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/CdIccStore.html colord-1.3.2/doc/api/html/CdIccStore.html --- colord-1.2.12/doc/api/html/CdIccStore.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/CdIccStore.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,7 +51,7 @@ -gboolean +gboolean cd_icc_store_search_location () @@ -59,7 +59,7 @@ -gboolean +gboolean cd_icc_store_search_kind () @@ -91,7 +91,7 @@ -GPtrArray * +GPtrArray * cd_icc_store_get_all () @@ -128,12 +128,12 @@ void added -Run Last +Run Last void removed -Run Last +Run Last @@ -159,7 +159,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── CdIccStore
@@ -174,24 +174,23 @@ cd_icc_store_new (void);

Creates a new CdIccStore object.

-

Returns

+

Returns

a new CdIccStore object.

-

-

Since 1.0.2

+

Since: 1.0.2

cd_icc_store_search_location ()

-
gboolean
+
gboolean
 cd_icc_store_search_location (CdIccStore *store,
-                              const gchar *location,
+                              const gchar *location,
                               CdIccStoreSearchFlags search_flags,
-                              GCancellable *cancellable,
-                              GError **error);

+                              GCancellable *cancellable,
+                              GError **error);

Adds a location to be watched for ICC profiles

-

Parameters

+

Parameters

@@ -216,36 +215,35 @@ - + - +

cancellable

A GCancellable or NULL

A GCancellable or NULL

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

TRUE for success

-

+

Returns

+

TRUE for success

-

Since 1.0.2

+

Since: 1.0.2

cd_icc_store_search_kind ()

-
gboolean
+
gboolean
 cd_icc_store_search_kind (CdIccStore *store,
                           CdIccStoreSearchKind search_kind,
                           CdIccStoreSearchFlags search_flags,
-                          GCancellable *cancellable,
-                          GError **error);

+                          GCancellable *cancellable,
+                          GError **error);

Adds a location to be watched for ICC profiles

-

Parameters

+

Parameters

@@ -270,23 +268,22 @@ - + - +

cancellable

A GCancellable or NULL

A GCancellable or NULL

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

TRUE for success

-

+

Returns

+

TRUE for success

-

Since 1.0.2

+

Since: 1.0.2

@@ -296,7 +293,7 @@ CdIccLoadFlags load_flags);

Sets the load flags to use when loading newly added profiles

-

Parameters

+

Parameters

@@ -317,7 +314,7 @@
-

Since 1.0.2

+

Since: 1.0.2

@@ -326,7 +323,7 @@ cd_icc_store_get_load_flags (CdIccStore *store);

Gets the load flags to use when loading newly added profiles

-

Parameters

+

Parameters

@@ -341,22 +338,21 @@
-

Returns

+

Returns

the load flags to use

-

-

Since 1.0.2

+

Since: 1.0.2

cd_icc_store_set_cache ()

void
 cd_icc_store_set_cache (CdIccStore *store,
-                        GResource *cache);
+ GResource *cache);

Sets an optional cache to use when reading profiles. This is probably only useful to the colord daemon. This function can only be called once.

-

Parameters

+

Parameters

@@ -371,22 +367,22 @@ - +

cache

a GResource

a GResource

  
-

Since 1.0.2

+

Since: 1.0.2

cd_icc_store_get_all ()

-
GPtrArray *
+
GPtrArray *
 cd_icc_store_get_all (CdIccStore *store);

 
Gets the list of CdIcc objects in the store

 

-
Parameters

+
Parameters

 
@@ -401,21 +397,21 @@
 

 
 


 

 

-
Returns

+
Returns

 
 ICC profile objects. 

 
[transfer container][element-type CdIcc]

 

-
Since 1.0.2

+
Since: 1.0.2

cd_icc_store_find_by_filename ()

CdIcc *
 cd_icc_store_find_by_filename (CdIccStore *store,
-                               const gchar *filename);
+ const gchar *filename);

Finds a ICC object in the store by filename.

-

Parameters

+

Parameters

@@ -437,21 +433,21 @@
-

Returns

-

an ICC profile object or NULL.

+

Returns

+

an ICC profile object or NULL.

[transfer full]

-

Since 1.0.2

+

Since: 1.0.2

cd_icc_store_find_by_checksum ()

CdIcc *
 cd_icc_store_find_by_checksum (CdIccStore *store,
-                               const gchar *checksum);
+ const gchar *checksum);

Finds a ICC object in the store by checksum.

-

Parameters

+

Parameters

@@ -473,11 +469,11 @@
-

Returns

-

an ICC profile object or NULL.

+

Returns

+

an ICC profile object or NULL.

[transfer full]

-

Since 1.0.2

+

Since: 1.0.2

@@ -486,7 +482,7 @@

enum CdIccStoreSearchFlags

Flags used when adding scan locations.

-

Members

+

Members

@@ -511,14 +507,14 @@
-

Since 1.1.1

+

Since: 1.1.1

enum CdIccStoreSearchKind

The kind of profiles locations to search.

-

Members

+

Members

@@ -550,7 +546,7 @@
-

Since 1.1.1

+

Since: 1.1.1

@@ -560,9 +556,9 @@ 
void
 user_function (CdIccStore *profile,
                CdIcc      *icc,
-               gpointer    user_data)
-

Flags: Run Last

-

Since 1.0.2

+ gpointer user_data) +

Flags: Run Last

+

Since: 1.0.2

@@ -570,13 +566,13 @@ 
void
 user_function (CdIccStore *profile,
                CdIcc      *icc,
-               gpointer    user_data)
-

Flags: Run Last

-

Since 1.0.2

+ gpointer user_data) +

Flags: Run Last

+

Since: 1.0.2

-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-client.html colord-1.3.2/doc/api/html/colord-cd-client.html --- colord-1.2.12/doc/api/html/colord-cd-client.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-client.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,151 +41,7 @@ -void - - -(*device_added) () - - - - -void - - -(*device_removed) () - - - - -void - - -(*device_changed) () - - - - -void - - -(*profile_added) () - - - - -void - - -(*profile_removed) () - - - - -void - - -(*profile_changed) () - - - - -void - - -(*sensor_added) () - - - - -void - - -(*sensor_removed) () - - - - -void - - -(*sensor_changed) () - - - - -void - - -(*changed) () - - - - -void - - -(*_cd_client_reserved1) () - - - - -void - - -(*_cd_client_reserved2) () - - - - -void - - -(*_cd_client_reserved3) () - - - - -void - - -(*_cd_client_reserved4) () - - - - -void - - -(*_cd_client_reserved5) () - - - - -void - - -(*_cd_client_reserved6) () - - - - -void - - -(*_cd_client_reserved7) () - - - - -void - - -(*_cd_client_reserved8) () - - - - -GQuark +GQuark cd_client_error_quark () @@ -209,7 +65,7 @@ -gboolean +gboolean cd_client_connect_finish () @@ -289,7 +145,7 @@ -gboolean +gboolean cd_client_delete_device_finish () @@ -305,7 +161,7 @@ -gboolean +gboolean cd_client_delete_profile_finish () @@ -401,7 +257,7 @@ -GPtrArray * +GPtrArray * cd_client_get_devices_finish () @@ -417,7 +273,7 @@ -GPtrArray * +GPtrArray * cd_client_get_devices_by_kind_finish () @@ -433,7 +289,7 @@ -GPtrArray * +GPtrArray * cd_client_get_profiles_finish () @@ -449,7 +305,7 @@ -GPtrArray * +GPtrArray * cd_client_get_sensors_finish () @@ -489,7 +345,7 @@ -gboolean +gboolean cd_client_get_connected () @@ -497,28 +353,28 @@ -gboolean +gboolean cd_client_get_has_server () -const gchar * +const gchar * cd_client_get_daemon_version () -const gchar * +const gchar * cd_client_get_system_vendor () -const gchar * +const gchar * cd_client_get_system_model () @@ -555,168 +411,14 @@

Functions

-

device_added ()

-
void
-(*device_added) (CdClient *client,
-                 CdDevice *device);
-

-

-
-
-
-

device_removed ()

-
void
-(*device_removed) (CdClient *client,
-                   CdDevice *device);
-

-

-
-
-
-

device_changed ()

-
void
-(*device_changed) (CdClient *client,
-                   CdDevice *device);
-

-

-
-
-
-

profile_added ()

-
void
-(*profile_added) (CdClient *client,
-                  CdProfile *profile);
-

-

-
-
-
-

profile_removed ()

-
void
-(*profile_removed) (CdClient *client,
-                    CdProfile *profile);
-

-

-
-
-
-

profile_changed ()

-
void
-(*profile_changed) (CdClient *client,
-                    CdProfile *profile);
-

-

-
-
-
-

sensor_added ()

-
void
-(*sensor_added) (CdClient *client,
-                 CdSensor *sensor);
-

-

-
-
-
-

sensor_removed ()

-
void
-(*sensor_removed) (CdClient *client,
-                   CdSensor *sensor);
-

-

-
-
-
-

sensor_changed ()

-
void
-(*sensor_changed) (CdClient *client,
-                   CdSensor *sensor);
-

-

-
-
-
-

changed ()

-
void
-(*changed) (CdDevice *device);
-

-

-
-
-
-

_cd_client_reserved1 ()

-
void
-(*_cd_client_reserved1) (void);
-

-

-
-
-
-

_cd_client_reserved2 ()

-
void
-(*_cd_client_reserved2) (void);
-

-

-
-
-
-

_cd_client_reserved3 ()

-
void
-(*_cd_client_reserved3) (void);
-

-

-
-
-
-

_cd_client_reserved4 ()

-
void
-(*_cd_client_reserved4) (void);
-

-

-
-
-
-

_cd_client_reserved5 ()

-
void
-(*_cd_client_reserved5) (void);
-

-

-
-
-
-

_cd_client_reserved6 ()

-
void
-(*_cd_client_reserved6) (void);
-

-

-
-
-
-

_cd_client_reserved7 ()

-
void
-(*_cd_client_reserved7) (void);
-

-

-
-
-
-

_cd_client_reserved8 ()

-
void
-(*_cd_client_reserved8) (void);
-

-

-
-
-

cd_client_error_quark ()

-
GQuark
+
GQuark
 cd_client_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.0

+
Since: 0.1.0
@@ -725,23 +427,22 @@ cd_client_new (void);

Creates a new CdClient object.

-

Returns

+

Returns

a new CdClient object.

-

-

Since 0.1.0

+

Since: 0.1.0

cd_client_connect ()

void
 cd_client_connect (CdClient *client,
-                   GCancellable *cancellable,
-                   GAsyncReadyCallback callback,
-                   gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Connects to the colord daemon.

-

Parameters

+

Parameters

@@ -756,7 +457,7 @@ - + @@ -773,18 +474,18 @@

cancellable

a GCancellable or NULL

a GCancellable or NULL

  
-

Since 0.1.6

+

Since: 0.1.6

cd_client_connect_finish ()

-
gboolean
+
gboolean
 cd_client_connect_finish (CdClient *client,
-                          GAsyncResult *res,
-                          GError **error);

+                          GAsyncResult *res,
+                          GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -799,38 +500,37 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.6

+

Since: 0.1.6

cd_client_create_device ()

void
 cd_client_create_device (CdClient *client,
-                         const gchar *id,
+                         const gchar *id,
                          CdObjectScope scope,
-                         GHashTable *properties,
-                         GCancellable *cancellable,
-                         GAsyncReadyCallback callback,
-                         gpointer user_data);
+ GHashTable *properties, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Creates a color device.

-

Parameters

+

Parameters

@@ -856,12 +556,12 @@ +set on the device, or NULL.

- + @@ -878,18 +578,18 @@

properties

properties to -set on the device, or NULL.

[element-type utf8 utf8][allow-none]

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_create_device_finish ()

CdDevice *
 cd_client_create_device_finish (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -904,38 +604,38 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdDevice or NULL.

+

Returns

+

a CdDevice or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_client_create_profile ()

void
 cd_client_create_profile (CdClient *client,
-                          const gchar *id,
+                          const gchar *id,
                           CdObjectScope scope,
-                          GHashTable *properties,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data);
+ GHashTable *properties, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Creates a color profile.

-

Parameters

+

Parameters

@@ -961,12 +661,12 @@ +set on the profile, or NULL.

- + @@ -983,18 +683,18 @@

properties

properties to -set on the profile, or NULL.

[element-type utf8 utf8][allow-none]

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_create_profile_finish ()

CdProfile *
 cd_client_create_profile_finish (CdClient *client,
-                                 GAsyncResult *res,
-                                 GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1009,23 +709,23 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

@@ -1034,12 +734,12 @@ cd_client_create_profile_for_icc (CdClient *client, CdIcc *icc, CdObjectScope scope, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Creates a color profile for an CdIcc Object.

-

Parameters

+

Parameters

@@ -1064,7 +764,7 @@ - + @@ -1081,7 +781,7 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 1.1.1

+

Since: 1.1.1

@@ -1089,11 +789,11 @@ 
CdProfile *
 cd_client_create_profile_for_icc_finish
                                (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1108,38 +808,38 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 1.1.1

+

Since: 1.1.1

cd_client_import_profile ()

void
 cd_client_import_profile (CdClient *client,
-                          GFile *file,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data);
+ GFile *file, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Imports a color profile into the users home directory.

If the profile should be accessable for all users, then call cd_profile_install_system_wide() on the result.

-

Parameters

+

Parameters

@@ -1154,12 +854,12 @@ - + - + @@ -1176,18 +876,18 @@

file

a GFile

a GFile

  

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.12

+

Since: 0.1.12

cd_client_import_profile_finish ()

CdProfile *
 cd_client_import_profile_finish (CdClient *client,
-                                 GAsyncResult *res,
-                                 GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1202,23 +902,23 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 0.1.12

+

Since: 0.1.12

@@ -1226,12 +926,12 @@ 
void
 cd_client_delete_device (CdClient *client,
                          CdDevice *device,
-                         GCancellable *cancellable,
-                         GAsyncReadyCallback callback,
-                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Deletes a device.

-

Parameters

+

Parameters

@@ -1251,7 +951,7 @@ - + @@ -1268,18 +968,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_delete_device_finish ()

-
gboolean
+
gboolean
 cd_client_delete_device_finish (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);

+                                GAsyncResult *res,
+                                GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1294,23 +994,22 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

@@ -1318,12 +1017,12 @@ 
void
 cd_client_delete_profile (CdClient *client,
                           CdProfile *profile,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Deletes a profile.

-

Parameters

+

Parameters

@@ -1343,7 +1042,7 @@ - + @@ -1360,18 +1059,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_delete_profile_finish ()

-
gboolean
+
gboolean
 cd_client_delete_profile_finish (CdClient *client,
-                                 GAsyncResult *res,
-                                 GError **error);

+                                 GAsyncResult *res,
+                                 GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1386,36 +1085,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_client_find_device ()

void
 cd_client_find_device (CdClient *client,
-                       const gchar *id,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ const gchar *id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a device by an ID.

-

Parameters

+

Parameters

@@ -1435,7 +1133,7 @@ - + @@ -1452,18 +1150,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_find_device_finish ()

CdDevice *
 cd_client_find_device_finish (CdClient *client,
-                              GAsyncResult *res,
-                              GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1478,37 +1176,37 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdDevice or NULL.

+

Returns

+

a CdDevice or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_client_find_device_by_property ()

void
 cd_client_find_device_by_property (CdClient *client,
-                                   const gchar *key,
-                                   const gchar *value,
-                                   GCancellable *cancellable,
-                                   GAsyncReadyCallback callback,
-                                   gpointer user_data);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a color device that has a property value.

-

Parameters

+

Parameters

@@ -1533,7 +1231,7 @@ - + @@ -1550,7 +1248,7 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

@@ -1558,11 +1256,11 @@ 
CdDevice *
 cd_client_find_device_by_property_finish
                                (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1577,36 +1275,36 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdDevice or NULL.

+

Returns

+

a CdDevice or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_client_find_profile ()

void
 cd_client_find_profile (CdClient *client,
-                        const gchar *id,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);
+ const gchar *id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a profile by an ID.

-

Parameters

+

Parameters

@@ -1626,7 +1324,7 @@ - + @@ -1643,18 +1341,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_find_profile_finish ()

CdProfile *
 cd_client_find_profile_finish (CdClient *client,
-                               GAsyncResult *res,
-                               GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1669,36 +1367,36 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_client_find_profile_by_filename ()

void
 cd_client_find_profile_by_filename (CdClient *client,
-                                    const gchar *filename,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);
+ const gchar *filename, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a profile by a filename.

-

Parameters

+

Parameters

@@ -1718,7 +1416,7 @@ - + @@ -1735,7 +1433,7 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

@@ -1743,11 +1441,11 @@ 
CdProfile *
 cd_client_find_profile_by_filename_finish
                                (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1762,23 +1460,23 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

@@ -1786,12 +1484,12 @@ 
void
 cd_client_get_standard_space (CdClient *client,
                               CdStandardSpace standard_space,
-                              GCancellable *cancellable,
-                              GAsyncReadyCallback callback,
-                              gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a standard profile space.

-

Parameters

+

Parameters

@@ -1811,7 +1509,7 @@ - + @@ -1828,18 +1526,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_get_standard_space_finish ()

CdProfile *
 cd_client_get_standard_space_finish (CdClient *client,
-                                     GAsyncResult *res,
-                                     GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1854,35 +1552,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_client_get_devices ()

void
 cd_client_get_devices (CdClient *client,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets an array of color devices.

-

Parameters

+

Parameters

@@ -1897,7 +1595,7 @@ - + @@ -1914,18 +1612,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_get_devices_finish ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_devices_finish (CdClient *client,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1940,23 +1638,23 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

the devices.

[element-type CdDevice][transfer full]

-

Since 0.1.8

+

Since: 0.1.8

@@ -1964,12 +1662,12 @@ 
void
 cd_client_get_devices_by_kind (CdClient *client,
                                CdDeviceKind kind,
-                               GCancellable *cancellable,
-                               GAsyncReadyCallback callback,
-                               gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets an array of color devices.

-

Parameters

+

Parameters

@@ -1989,7 +1687,7 @@ - + @@ -2006,18 +1704,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_get_devices_by_kind_finish ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_devices_by_kind_finish (CdClient *client,
-                                      GAsyncResult *res,
-                                      GError **error);

+                                      GAsyncResult *res,
+                                      GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -2032,35 +1730,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

the devices.

[element-type CdDevice][transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_client_get_profiles ()

void
 cd_client_get_profiles (CdClient *client,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets an array of color profiles.

-

Parameters

+

Parameters

@@ -2075,7 +1773,7 @@ - + @@ -2092,18 +1790,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_get_profiles_finish ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_profiles_finish (CdClient *client,
-                               GAsyncResult *res,
-                               GError **error);

+                               GAsyncResult *res,
+                               GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -2118,35 +1816,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

the profiles.

[element-type CdProfile][transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_client_get_sensors ()

void
 cd_client_get_sensors (CdClient *client,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets an array of color sensors.

-

Parameters

+

Parameters

@@ -2161,7 +1859,7 @@ - + @@ -2178,18 +1876,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_client_get_sensors_finish ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_sensors_finish (CdClient *client,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -2204,37 +1902,37 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

the sensors.

[element-type CdSensor][transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_client_find_profile_by_property ()

void
 cd_client_find_profile_by_property (CdClient *client,
-                                    const gchar *key,
-                                    const gchar *value,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a color profile that has a property value.

-

Parameters

+

Parameters

@@ -2259,7 +1957,7 @@ - + @@ -2276,7 +1974,7 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.24

+

Since: 0.1.24

@@ -2284,11 +1982,11 @@ 
CdProfile *
 cd_client_find_profile_by_property_finish
                                (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -2303,36 +2001,36 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 0.1.24

+

Since: 0.1.24

cd_client_find_sensor ()

void
 cd_client_find_sensor (CdClient *client,
-                       const gchar *id,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ const gchar *id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a sensor by an ID.

-

Parameters

+

Parameters

@@ -2352,7 +2050,7 @@ - + @@ -2369,18 +2067,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.26

+

Since: 0.1.26

cd_client_find_sensor_finish ()

CdSensor *
 cd_client_find_sensor_finish (CdClient *client,
-                              GAsyncResult *res,
-                              GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -2395,32 +2093,32 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdSensor or NULL.

+

Returns

+

a CdSensor or NULL.

[transfer full]

-

Since 0.1.26

+

Since: 0.1.26

cd_client_get_connected ()

-
gboolean
+
gboolean
 cd_client_get_connected (CdClient *client);

 
Gets if the client has been connected.

 

-
Parameters

+
Parameters

 
@@ -2435,22 +2133,21 @@
 

 
 


 

 

-
Returns

-
 TRUE if properties are valid

-

+
Returns

+
 TRUE if properties are valid

 

-
Since 0.1.9

+
Since: 0.1.9

cd_client_get_has_server ()

-
gboolean
+
gboolean
 cd_client_get_has_server (CdClient *client);

 
Gets if the colord server is currently running.
 WARNING: This function may block for up to 5 seconds waiting for the daemon
 to start if it is not already running.

 

-
Parameters

+
Parameters

 
@@ -2465,20 +2162,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if the colord process is running

-

+
Returns

+
 TRUE if the colord process is running

 

-
Since 0.1.12

+
Since: 0.1.12

cd_client_get_daemon_version ()

-
const gchar *
+
const gchar *
 cd_client_get_daemon_version (CdClient *client);

 
Get colord daemon version.

 

-
Parameters

+
Parameters

 
@@ -2493,20 +2189,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string containing the daemon version, e.g. "0.1.0"

-

 

-
Since 0.1.0

+
Since: 0.1.0

cd_client_get_system_vendor ()

-
const gchar *
+
const gchar *
 cd_client_get_system_vendor (CdClient *client);

 
Get system vendor.

 

-
Parameters

+
Parameters

 
@@ -2521,20 +2216,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string containing the system vendor, e.g. "Lenovo"

-

 

-
Since 1.0.2

+
Since: 1.0.2

cd_client_get_system_model ()

-
const gchar *
+
const gchar *
 cd_client_get_system_model (CdClient *client);

 
Get system model.

 

-
Parameters

+
Parameters

 
@@ -2549,11 +2243,10 @@
 

 
 


 

 

-
Returns

+
Returns

 
 string containing the system model, e.g. "T61"

-

 

-
Since 1.0.2

+
Since: 1.0.2
@@ -2576,6 +2269,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-client-sync.html colord-1.3.2/doc/api/html/colord-cd-client-sync.html --- colord-1.2.12/doc/api/html/colord-cd-client-sync.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-client-sync.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@ -gboolean +gboolean cd_client_connect_sync () @@ -49,7 +49,7 @@ -gboolean +gboolean cd_client_delete_profile_sync () @@ -57,7 +57,7 @@ -gboolean +gboolean cd_client_delete_device_sync () @@ -113,7 +113,7 @@ -GPtrArray * +GPtrArray * cd_client_get_devices_sync () @@ -121,7 +121,7 @@ -GPtrArray * +GPtrArray * cd_client_get_profiles_sync () @@ -129,7 +129,7 @@ -GPtrArray * +GPtrArray * cd_client_get_sensors_sync () @@ -161,7 +161,7 @@ -GPtrArray * +GPtrArray * cd_client_get_devices_by_kind_sync () @@ -196,15 +196,15 @@

Functions

cd_client_connect_sync ()

-
gboolean
+
gboolean
 cd_client_connect_sync (CdClient *client,
-                        GCancellable *cancellable,
-                        GError **error);

+                        GCancellable *cancellable,
+                        GError **error);

Connects to the colord daemon.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -219,37 +219,36 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.0

+

Since: 0.1.0

cd_client_delete_profile_sync ()

-
gboolean
+
gboolean
 cd_client_delete_profile_sync (CdClient *client,
                                CdProfile *profile,
-                               GCancellable *cancellable,
-                               GError **error);

+                               GCancellable *cancellable,
+                               GError **error);

Deletes a color profile.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -269,37 +268,36 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

TRUE is the profile was deleted

-

+

Returns

+

TRUE is the profile was deleted

-

Since 0.1.8

+

Since: 0.1.8

cd_client_delete_device_sync ()

-
gboolean
+
gboolean
 cd_client_delete_device_sync (CdClient *client,
                               CdDevice *device,
-                              GCancellable *cancellable,
-                              GError **error);

+                              GCancellable *cancellable,
+                              GError **error);

Deletes a color device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -319,37 +317,36 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

TRUE is the device was deleted

-

+

Returns

+

TRUE is the device was deleted

-

Since 0.1.8

+

Since: 0.1.8

cd_client_find_profile_sync ()

CdProfile *
 cd_client_find_profile_sync (CdClient *client,
-                             const gchar *id,
-                             GCancellable *cancellable,
-                             GError **error);
+ const gchar *id, + GCancellable *cancellable, + GError **error);

Finds a color profile from its id.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -369,23 +366,23 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

A CdProfile object, or NULL for error.

+

Returns

+

A CdProfile object, or NULL for error.

[transfer full]

-

Since 0.1.0

+

Since: 0.1.0

@@ -393,14 +390,14 @@ 
CdProfile *
 cd_client_find_profile_by_filename_sync
                                (CdClient *client,
-                                const gchar *filename,
-                                GCancellable *cancellable,
-                                GError **error);
+ const gchar *filename, + GCancellable *cancellable, + GError **error);

Finds a color profile from its filename.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -420,39 +417,39 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

A CdProfile object, or NULL for error.

+

Returns

+

A CdProfile object, or NULL for error.

[transfer full]

-

Since 0.1.3

+

Since: 0.1.3

cd_client_create_profile_sync ()

CdProfile *
 cd_client_create_profile_sync (CdClient *client,
-                               const gchar *id,
+                               const gchar *id,
                                CdObjectScope scope,
-                               GHashTable *properties,
-                               GCancellable *cancellable,
-                               GError **error);
+ GHashTable *properties, + GCancellable *cancellable, + GError **error);

Creates a color profile.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -478,28 +475,28 @@ +set on the profile, or NULL.

- + - +

properties

properties to -set on the profile, or NULL.

[element-type utf8 utf8][allow-none]

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

A CdProfile object, or NULL for error.

+

Returns

+

A CdProfile object, or NULL for error.

[transfer full]

-

Since 0.1.2

+

Since: 0.1.2

@@ -508,13 +505,13 @@ cd_client_create_profile_for_icc_sync (CdClient *client, CdIcc *icc, CdObjectScope scope, - GCancellable *cancellable, - GError **error); + GCancellable *cancellable, + GError **error);

Creates a color profile from a CdIcc object.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -539,37 +536,37 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

A CdProfile object, or NULL for error.

+

Returns

+

A CdProfile object, or NULL for error.

[transfer full]

-

Since 1.1.1

+

Since: 1.1.1

cd_client_import_profile_sync ()

CdProfile *
 cd_client_import_profile_sync (CdClient *client,
-                               GFile *file,
-                               GCancellable *cancellable,
-                               GError **error);
+ GFile *file, + GCancellable *cancellable, + GError **error);

Imports a color profile into the users home directory.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -584,44 +581,44 @@ - + - + - +

file

A GFile

A GFile

  

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

A CdProfile object, or NULL for error.

+

Returns

+

A CdProfile object, or NULL for error.

[transfer full]

-

Since 0.1.12

+

Since: 0.1.12

cd_client_create_device_sync ()

CdDevice *
 cd_client_create_device_sync (CdClient *client,
-                              const gchar *id,
+                              const gchar *id,
                               CdObjectScope scope,
-                              GHashTable *properties,
-                              GCancellable *cancellable,
-                              GError **error);
+ GHashTable *properties, + GCancellable *cancellable, + GError **error);

Creates a color device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -647,41 +644,41 @@ +set on the device, or NULL.

- + - +

properties

properties to -set on the device, or NULL.

[element-type utf8 utf8][allow-none]

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

A CdDevice object, or NULL for error.

+

Returns

+

A CdDevice object, or NULL for error.

[transfer full]

-

Since 0.1.2

+

Since: 0.1.2

cd_client_get_devices_sync ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_devices_sync (CdClient *client,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GCancellable *cancellable,
+                            GError **error);

Get an array of the device objects.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -696,37 +693,37 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

+

Returns

an array of CdDevice objects.

[transfer container][element-type CdDevice]

-

Since 0.1.0

+

Since: 0.1.0

cd_client_get_profiles_sync ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_profiles_sync (CdClient *client,
-                             GCancellable *cancellable,
-                             GError **error);

+                             GCancellable *cancellable,
+                             GError **error);

Get an array of the profile objects.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -741,37 +738,37 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

+

Returns

an array of CdProfile objects.

[transfer container][element-type CdProfile]

-

Since 0.1.0

+

Since: 0.1.0

cd_client_get_sensors_sync ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_sensors_sync (CdClient *client,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GCancellable *cancellable,
+                            GError **error);

Get an array of the sensor objects.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -786,38 +783,38 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

+

Returns

an array of CdSensor objects.

[transfer container][element-type CdSensor]

-

Since 0.1.0

+

Since: 0.1.0

cd_client_find_device_sync ()

CdDevice *
 cd_client_find_device_sync (CdClient *client,
-                            const gchar *id,
-                            GCancellable *cancellable,
-                            GError **error);
+ const gchar *id, + GCancellable *cancellable, + GError **error);

Finds a color device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -837,23 +834,23 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

A CdDevice object, or NULL for error.

+

Returns

+

A CdDevice object, or NULL for error.

[transfer full]

-

Since 0.1.0

+

Since: 0.1.0

@@ -861,15 +858,15 @@ 
CdDevice *
 cd_client_find_device_by_property_sync
                                (CdClient *client,
-                                const gchar *key,
-                                const gchar *value,
-                                GCancellable *cancellable,
-                                GError **error);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GError **error);

Finds a color device that has a property value.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -894,23 +891,23 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

A CdDevice object, or NULL for error.

+

Returns

+

A CdDevice object, or NULL for error.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

@@ -918,13 +915,13 @@ 
CdProfile *
 cd_client_get_standard_space_sync (CdClient *client,
                                    CdStandardSpace standard_space,
-                                   GCancellable *cancellable,
-                                   GError **error);
+ GCancellable *cancellable, + GError **error);

Finds a standard colorspace.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -944,37 +941,37 @@ - + - +

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

A CdProfile object, or NULL for error.

+

Returns

+

A CdProfile object, or NULL for error.

[transfer full]

-

Since 0.1.2

+

Since: 0.1.2

cd_client_get_devices_by_kind_sync ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_devices_by_kind_sync (CdClient *client,
                                     CdDeviceKind kind,
-                                    GCancellable *cancellable,
-                                    GError **error);

+                                    GCancellable *cancellable,
+                                    GError **error);

Get an array of the device objects of a specified kind.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -994,24 +991,24 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

+

Returns

an array of CdDevice objects.

[transfer container][element-type CdDevice]

-

Since 0.1.0

+

Since: 0.1.0

@@ -1019,15 +1016,15 @@ 
CdProfile *
 cd_client_find_profile_by_property_sync
                                (CdClient *client,
-                                const gchar *key,
-                                const gchar *value,
-                                GCancellable *cancellable,
-                                GError **error);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GError **error);

Finds a color profile that has a property value.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -1052,37 +1049,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

A CdProfile object, or NULL for error.

+

Returns

+

A CdProfile object, or NULL for error.

[transfer full]

-

Since 0.1.24

+

Since: 0.1.24

cd_client_find_sensor_sync ()

CdSensor *
 cd_client_find_sensor_sync (CdClient *client,
-                            const gchar *id,
-                            GCancellable *cancellable,
-                            GError **error);
+ const gchar *id, + GCancellable *cancellable, + GError **error);

Finds a color sensor.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -1102,23 +1099,23 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

A CdSensor object, or NULL for error.

+

Returns

+

A CdSensor object, or NULL for error.

[transfer full]

-

Since 0.1.26

+

Since: 0.1.26

@@ -1126,6 +1123,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-color.html colord-1.3.2/doc/api/html/colord-cd-color.html --- colord-1.2.12/doc/api/html/colord-cd-color.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-color.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@ -const gchar * +const gchar * cd_color_swatch_get_name () @@ -288,7 +288,7 @@ -gdouble +gdouble cd_color_lab_delta_e76 () @@ -368,7 +368,7 @@ -gdouble +gdouble cd_color_uvw_get_chroma_difference () @@ -376,7 +376,7 @@ -gboolean +gboolean cd_color_get_blackbody_rgb () @@ -392,7 +392,7 @@ -gdouble +gdouble cd_color_xyz_to_cct () @@ -408,7 +408,7 @@ -GPtrArray * +GPtrArray * cd_color_rgb_array_new () @@ -416,7 +416,7 @@ -gboolean +gboolean cd_color_rgb_array_is_monotonic () @@ -424,7 +424,7 @@ -GPtrArray * +GPtrArray * cd_color_rgb_array_interpolate () @@ -465,24 +465,16 @@

Functions

cd_color_swatch_get_name ()

-
const gchar *
+
const gchar *
 cd_color_swatch_get_name (const CdColorSwatch *swatch);

-

-
Returns

-

-

-
Since 0.1.32

+
Since: 0.1.32

cd_color_swatch_get_value ()

const CdColorLab *
 cd_color_swatch_get_value (const CdColorSwatch *swatch);
-
-

Returns

-

-
-

Since 0.1.32

+

Since: 0.1.32

@@ -491,11 +483,10 @@ cd_color_xyz_new (void);

Allocates a color value.

-

Returns

+

Returns

A newly allocated CdColorXYZ object

-

-

Since 0.1.0

+

Since: 0.1.0

@@ -504,11 +495,10 @@ cd_color_lab_new (void);

Allocates a color value.

-

Returns

+

Returns

A newly allocated CdColorLab object

-

-

Since 0.1.32

+

Since: 0.1.32

@@ -517,11 +507,10 @@ cd_color_rgb_new (void);

Allocates a color value.

-

Returns

+

Returns

A newly allocated CdColorRGB object

-

-

Since 0.1.0

+

Since: 0.1.0

@@ -530,11 +519,10 @@ cd_color_yxy_new (void);

Allocates a color value.

-

Returns

+

Returns

A newly allocated CdColorYxy object

-

-

Since 0.1.0

+

Since: 0.1.0

@@ -543,11 +531,10 @@ cd_color_uvw_new (void);

Allocates a color value.

-

Returns

+

Returns

A newly allocated CdColorUVW object

-

-

Since 1.1.6

+

Since: 1.1.6

@@ -556,11 +543,10 @@ cd_color_swatch_new (void);

Allocates a color value.

-

Returns

+

Returns

A newly allocated CdColorSwatch object

-

-

Since 0.1.32

+

Since: 0.1.32

@@ -569,7 +555,7 @@ cd_color_xyz_free (CdColorXYZ *src);

Deallocates a color value.

-

Parameters

+

Parameters

@@ -583,7 +569,7 @@
-

Since 0.1.0

+

Since: 0.1.0

@@ -592,7 +578,7 @@ cd_color_rgb_free (CdColorRGB *src);

Deallocates a color value.

-

Parameters

+

Parameters

@@ -606,7 +592,7 @@
-

Since 0.1.0

+

Since: 0.1.0

@@ -615,7 +601,7 @@ cd_color_lab_free (CdColorLab *src);

Deallocates a color value.

-

Parameters

+

Parameters

@@ -629,7 +615,7 @@
-

Since 0.1.32

+

Since: 0.1.32

@@ -638,7 +624,7 @@ cd_color_yxy_free (CdColorYxy *src);

Deallocates a color value.

-

Parameters

+

Parameters

@@ -652,7 +638,7 @@
-

Since 0.1.0

+

Since: 0.1.0

@@ -661,7 +647,7 @@ cd_color_uvw_free (CdColorUVW *src);

Deallocates a color value.

-

Parameters

+

Parameters

@@ -675,7 +661,7 @@
-

Since 1.1.6

+

Since: 1.1.6

@@ -684,7 +670,7 @@ cd_color_swatch_free (CdColorSwatch *src);

Deallocates a color swatch.

-

Parameters

+

Parameters

@@ -698,85 +684,61 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_color_xyz_dup ()

CdColorXYZ *
 cd_color_xyz_dup (const CdColorXYZ *src);
-
-

Returns

-

-
-

Since 0.1.27

+

Since: 0.1.27

cd_color_lab_dup ()

CdColorLab *
 cd_color_lab_dup (const CdColorLab *src);
-
-

Returns

-

-
-

Since 0.1.32

+

Since: 0.1.32

cd_color_rgb_dup ()

CdColorRGB *
 cd_color_rgb_dup (const CdColorRGB *src);
-
-

Returns

-

-
-

Since 0.1.27

+

Since: 0.1.27

cd_color_yxy_dup ()

CdColorYxy *
 cd_color_yxy_dup (const CdColorYxy *src);
-
-

Returns

-

-
-

Since 0.1.27

+

Since: 0.1.27

cd_color_uvw_dup ()

CdColorUVW *
 cd_color_uvw_dup (const CdColorUVW *src);
-
-

Returns

-

-
-

Since 1.1.6

+

Since: 1.1.6

cd_color_swatch_dup ()

CdColorSwatch *
 cd_color_swatch_dup (const CdColorSwatch *src);
-
-

Returns

-

-
-

Since 0.1.32

+

Since: 0.1.32

cd_color_xyz_set ()

void
 cd_color_xyz_set (CdColorXYZ *dest,
-                  gdouble X,
-                  gdouble Y,
-                  gdouble Z);
+ gdouble X, + gdouble Y, + gdouble Z);

Initialises a color value.

-

Parameters

+

Parameters

@@ -807,19 +769,19 @@
-

Since 0.1.27

+

Since: 0.1.27

cd_color_rgb_set ()

void
 cd_color_rgb_set (CdColorRGB *dest,
-                  gdouble R,
-                  gdouble G,
-                  gdouble B);
+ gdouble R, + gdouble G, + gdouble B);

Initialises a color value.

-

Parameters

+

Parameters

@@ -850,19 +812,19 @@
-

Since 0.1.27

+

Since: 0.1.27

cd_color_lab_set ()

void
 cd_color_lab_set (CdColorLab *dest,
-                  gdouble L,
-                  gdouble a,
-                  gdouble b);
+ gdouble L, + gdouble a, + gdouble b);

Initialises a color value.

-

Parameters

+

Parameters

@@ -893,19 +855,19 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_color_yxy_set ()

void
 cd_color_yxy_set (CdColorYxy *dest,
-                  gdouble Y,
-                  gdouble x,
-                  gdouble y);
+ gdouble Y, + gdouble x, + gdouble y);

Initialises a color value.

-

Parameters

+

Parameters

@@ -936,19 +898,19 @@
-

Since 0.1.27

+

Since: 0.1.27

cd_color_uvw_set ()

void
 cd_color_uvw_set (CdColorUVW *dest,
-                  gdouble U,
-                  gdouble V,
-                  gdouble W);
+ gdouble U, + gdouble V, + gdouble W);

Initialises a color value.

-

Parameters

+

Parameters

@@ -979,17 +941,17 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_color_swatch_set_name ()

void
 cd_color_swatch_set_name (CdColorSwatch *dest,
-                          const gchar *name);
+ const gchar *name);

Initialises a swatch name.

-

Parameters

+

Parameters

@@ -1010,7 +972,7 @@
-

Since 0.1.32

+

Since: 0.1.32

@@ -1020,7 +982,7 @@ const CdColorLab *value);

Initialises a swatch value.

-

Parameters

+

Parameters

@@ -1041,7 +1003,7 @@
-

Since 0.1.32

+

Since: 0.1.32

@@ -1051,7 +1013,7 @@ CdColorXYZ *dest);

Deep copies a color value.

-

Parameters

+

Parameters

@@ -1072,7 +1034,7 @@
-

Since 0.1.27

+

Since: 0.1.27

@@ -1082,7 +1044,7 @@ CdColorYxy *dest);

Deep copies a color value.

-

Parameters

+

Parameters

@@ -1103,7 +1065,7 @@
-

Since 0.1.27

+

Since: 0.1.27

@@ -1113,7 +1075,7 @@ CdColorUVW *dest);

Deep copies a color value.

-

Parameters

+

Parameters

@@ -1134,7 +1096,7 @@
-

Since 1.1.6

+

Since: 1.1.6

@@ -1144,7 +1106,7 @@ CdColorLab *dest);

Deep copies a color value.

-

Parameters

+

Parameters

@@ -1165,17 +1127,17 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_color_lab_delta_e76 ()

-
gdouble
+
gdouble
 cd_color_lab_delta_e76 (const CdColorLab *p1,
                         const CdColorLab *p2);

 
Calculates the ΔE of two colors using the 1976 formula.

 

-
Parameters

+
Parameters

 
@@ -1197,11 +1159,10 @@
 

 
 


 

 

-
Returns

+
Returns

 
 distance metric, where JND ΔE ≈ 2.3

-

 

-
Since 0.1.32

+
Since: 0.1.32
@@ -1210,7 +1171,7 @@ cd_color_xyz_clear (CdColorXYZ *dest);

Initialises a color value.

-

Parameters

+

Parameters

@@ -1224,7 +1185,7 @@
-

Since 0.1.27

+

Since: 0.1.27

@@ -1234,7 +1195,7 @@ CdColorRGB *dest);

Deep copies a color value.

-

Parameters

+

Parameters

@@ -1255,7 +1216,7 @@
-

Since 0.1.27

+

Since: 0.1.27

@@ -1265,7 +1226,7 @@ CdColorRGB *dest);

Convert from one color format to another.

-

Parameters

+

Parameters

@@ -1286,7 +1247,7 @@
-

Since 0.1.27

+

Since: 0.1.27

@@ -1296,7 +1257,7 @@ CdColorRGB8 *dest);

Convert from one color format to another.

-

Parameters

+

Parameters

@@ -1317,7 +1278,7 @@
-

Since 0.1.27

+

Since: 0.1.27

@@ -1327,7 +1288,7 @@ CdColorXYZ *dest);

Convert from one color format to another.

-

Parameters

+

Parameters

@@ -1348,7 +1309,7 @@
-

Since 0.1.27

+

Since: 0.1.27

@@ -1358,7 +1319,7 @@ CdColorYxy *dest);

Convert from one color format to another.

-

Parameters

+

Parameters

@@ -1379,7 +1340,7 @@
-

Since 0.1.27

+

Since: 0.1.27

@@ -1390,7 +1351,7 @@ CdColorUVW *dest);

Convert from one color format to another.

-

Parameters

+

Parameters

@@ -1416,7 +1377,7 @@
-

Since 1.1.6

+

Since: 1.1.6

@@ -1426,7 +1387,7 @@ CdColorUVW *dest);

Convert from one color format to another.

-

Parameters

+

Parameters

@@ -1447,17 +1408,17 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_color_uvw_set_planckian_locus ()

void
 cd_color_uvw_set_planckian_locus (CdColorUVW *dest,
-                                  gdouble temp);
+ gdouble temp);

Sets the CIEUVW color from a Planckian locus of specific temperature.

-

Parameters

+

Parameters

@@ -1478,17 +1439,17 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_color_uvw_get_chroma_difference ()

-
gdouble
+
gdouble
 cd_color_uvw_get_chroma_difference (const CdColorUVW *p1,
                                     const CdColorUVW *p2);

 
Gets the chromaticity distance in the CIE 1960 UCS.

 

-
Parameters

+
Parameters

 
@@ -1510,22 +1471,21 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The Euclidean distance

-

 

-
Since 1.1.6

+
Since: 1.1.6

cd_color_get_blackbody_rgb ()

-
gboolean
-cd_color_get_blackbody_rgb (guint temp,
+
gboolean
+cd_color_get_blackbody_rgb (guint temp,
                             CdColorRGB *result);

 
Get the blackbody color for a specific temperature. If the temperature
 range is outside 1000K to 10000K then the result is clipped.

 

-
Parameters

+
Parameters

 
@@ -1547,12 +1507,11 @@
 

 
 


 

 

-
Returns

+
Returns

 
 TRUE if temp
 was in range and the result accurate

-

 

-
Since 0.1.26

+
Since: 0.1.26
@@ -1560,18 +1519,18 @@ 
void
 cd_color_rgb_interpolate (const CdColorRGB *p1,
                           const CdColorRGB *p2,
-                          gdouble index,
+                          gdouble index,
                           CdColorRGB *result);
-

Since 0.1.26

+

Since: 0.1.26

cd_color_xyz_to_cct ()

-
gdouble
+
gdouble
 cd_color_xyz_to_cct (const CdColorXYZ *src);

 
Gets the correlated color temperature for the XYZ value.

 

-
Parameters

+
Parameters

 
@@ -1585,23 +1544,19 @@
 

 
 

 

 

-

-
Returns

-

-

-
Since 1.1.6

+
Since: 1.1.6

cd_color_xyz_normalize ()

void
 cd_color_xyz_normalize (const CdColorXYZ *src,
-                        gdouble max,
+                        gdouble max,
                         CdColorXYZ *dest);

Normalizes src to y=1.0

-

Parameters

+

Parameters

@@ -1622,29 +1577,29 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_color_rgb_array_new ()

-
GPtrArray *
+
GPtrArray *
 cd_color_rgb_array_new (void);

 
Creates a new RGB array.

 

-
Returns

+
Returns

 
 New array. 

 
[element-type CdColorRGB][transfer full]

 

-
Since 0.1.31

+
Since: 0.1.31

cd_color_rgb_array_is_monotonic ()

-
gboolean
-cd_color_rgb_array_is_monotonic (const GPtrArray *array);
+
gboolean
+cd_color_rgb_array_is_monotonic (const GPtrArray *array);

Checks the array for monotonicity.

-

Parameters

+

Parameters

@@ -1659,23 +1614,22 @@
-

Returns

-

TRUE if the array is monotonic

-

+

Returns

+

TRUE if the array is monotonic

-

Since 0.1.31

+

Since: 0.1.31

cd_color_rgb_array_interpolate ()

-
GPtrArray *
-cd_color_rgb_array_interpolate (const GPtrArray *array,
-                                guint new_length);
+
GPtrArray *
+cd_color_rgb_array_interpolate (const GPtrArray *array,
+                                guint new_length);

Interpolate the RGB array to a different size. This uses the Akima interpolation algorithm unless the array would become non-monotonic, in which case it falls back to linear interpolation.

-

Parameters

+

Parameters

@@ -1697,12 +1651,12 @@
-

Returns

+

Returns

An array of size new_length -or NULL.

+or NULL.

[element-type CdColorRGB][transfer full]

-

Since 0.1.31

+

Since: 0.1.31

@@ -1721,6 +1675,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-device.html colord-1.3.2/doc/api/html/colord-cd-device.html --- colord-1.2.12/doc/api/html/colord-cd-device.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-device.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,79 +41,7 @@ -void - - -(*changed) () - - - - -void - - -(*_cd_device_reserved1) () - - - - -void - - -(*_cd_device_reserved2) () - - - - -void - - -(*_cd_device_reserved3) () - - - - -void - - -(*_cd_device_reserved4) () - - - - -void - - -(*_cd_device_reserved5) () - - - - -void - - -(*_cd_device_reserved6) () - - - - -void - - -(*_cd_device_reserved7) () - - - - -void - - -(*_cd_device_reserved8) () - - - - -GQuark +GQuark cd_device_error_quark () @@ -145,7 +73,7 @@ -gboolean +gboolean cd_device_connect_finish () @@ -161,7 +89,7 @@ -gboolean +gboolean cd_device_set_property_finish () @@ -177,7 +105,7 @@ -gboolean +gboolean cd_device_add_profile_finish () @@ -193,7 +121,7 @@ -gboolean +gboolean cd_device_remove_profile_finish () @@ -209,7 +137,7 @@ -gboolean +gboolean cd_device_make_profile_default_finish () @@ -225,7 +153,7 @@ -gboolean +gboolean cd_device_profiling_inhibit_finish () @@ -241,7 +169,7 @@ -gboolean +gboolean cd_device_set_enabled_finish () @@ -257,7 +185,7 @@ -gboolean +gboolean cd_device_profiling_uninhibit_finish () @@ -296,49 +224,49 @@ -const gchar * +const gchar * cd_device_get_id () -const gchar * +const gchar * cd_device_get_model () -const gchar * +const gchar * cd_device_get_vendor () -const gchar * +const gchar * cd_device_get_serial () -const gchar * +const gchar * cd_device_get_seat () -const gchar * +const gchar * cd_device_get_format () -const gchar ** +const gchar ** cd_device_get_profiling_inhibitors () @@ -346,7 +274,7 @@ -guint64 +guint64 cd_device_get_created () @@ -354,7 +282,7 @@ -guint64 +guint64 cd_device_get_modified () @@ -386,7 +314,7 @@ -gboolean +gboolean cd_device_get_enabled () @@ -394,7 +322,7 @@ -gboolean +gboolean cd_device_get_embedded () @@ -410,7 +338,7 @@ -guint +guint cd_device_get_owner () @@ -418,7 +346,7 @@ -GPtrArray * +GPtrArray * cd_device_get_profiles () @@ -433,7 +361,7 @@ -const gchar * +const gchar * cd_device_get_object_path () @@ -441,14 +369,14 @@ -GHashTable * +GHashTable * cd_device_get_metadata () -const gchar * +const gchar * cd_device_get_metadata_item () @@ -464,7 +392,7 @@ -gboolean +gboolean cd_device_get_connected () @@ -472,7 +400,7 @@ -gchar * +gchar * cd_device_to_string () @@ -480,7 +408,7 @@ -gboolean +gboolean cd_device_equal () @@ -517,87 +445,14 @@

Functions

-

changed ()

-
void
-(*changed) (CdDevice *device);
-

-

-
-
-
-

_cd_device_reserved1 ()

-
void
-(*_cd_device_reserved1) (void);
-

-

-
-
-
-

_cd_device_reserved2 ()

-
void
-(*_cd_device_reserved2) (void);
-

-

-
-
-
-

_cd_device_reserved3 ()

-
void
-(*_cd_device_reserved3) (void);
-

-

-
-
-
-

_cd_device_reserved4 ()

-
void
-(*_cd_device_reserved4) (void);
-

-

-
-
-
-

_cd_device_reserved5 ()

-
void
-(*_cd_device_reserved5) (void);
-

-

-
-
-
-

_cd_device_reserved6 ()

-
void
-(*_cd_device_reserved6) (void);
-

-

-
-
-
-

_cd_device_reserved7 ()

-
void
-(*_cd_device_reserved7) (void);
-

-

-
-
-
-

_cd_device_reserved8 ()

-
void
-(*_cd_device_reserved8) (void);
-

-

-
-
-

cd_device_error_quark ()

-
GQuark
+
GQuark
 cd_device_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.0

+
Since: 0.1.0
@@ -606,20 +461,19 @@ cd_device_new (void);

Creates a new CdDevice object.

-

Returns

+

Returns

a new CdDevice object.

-

-

Since 0.1.0

+

Since: 0.1.0

cd_device_new_with_object_path ()

CdDevice *
-cd_device_new_with_object_path (const gchar *object_path);
+cd_device_new_with_object_path (const gchar *object_path);

Creates a new CdDevice object with a known object path.

-

Parameters

+

Parameters

@@ -634,23 +488,22 @@
-

Returns

+

Returns

a new device object.

-

-

Since 0.1.8

+

Since: 0.1.8

cd_device_connect ()

void
 cd_device_connect (CdDevice *device,
-                   GCancellable *cancellable,
-                   GAsyncReadyCallback callback,
-                   gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Connects to the object and fills up initial properties.

-

Parameters

+

Parameters

@@ -665,7 +518,7 @@ - + @@ -682,18 +535,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_device_connect_finish ()

-
gboolean
+
gboolean
 cd_device_connect_finish (CdDevice *device,
-                          GAsyncResult *res,
-                          GError **error);

+                          GAsyncResult *res,
+                          GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -708,37 +561,36 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_device_set_property ()

void
 cd_device_set_property (CdDevice *device,
-                        const gchar *key,
-                        const gchar *value,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Sets a property on the device.

-

Parameters

+

Parameters

@@ -763,7 +615,7 @@ - + @@ -780,18 +632,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_device_set_property_finish ()

-
gboolean
+
gboolean
 cd_device_set_property_finish (CdDevice *device,
-                               GAsyncResult *res,
-                               GError **error);

+                               GAsyncResult *res,
+                               GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -806,23 +658,22 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

@@ -831,12 +682,12 @@ cd_device_add_profile (CdDevice *device, CdDeviceRelation relation, CdProfile *profile, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Adds a profile to a device.

-

Parameters

+

Parameters

@@ -861,7 +712,7 @@ - + @@ -878,18 +729,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_device_add_profile_finish ()

-
gboolean
+
gboolean
 cd_device_add_profile_finish (CdDevice *device,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -904,23 +755,22 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

@@ -928,12 +778,12 @@ 
void
 cd_device_remove_profile (CdDevice *device,
                           CdProfile *profile,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Removes a profile from a device.

-

Parameters

+

Parameters

@@ -953,7 +803,7 @@ - + @@ -970,18 +820,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_device_remove_profile_finish ()

-
gboolean
+
gboolean
 cd_device_remove_profile_finish (CdDevice *device,
-                                 GAsyncResult *res,
-                                 GError **error);

+                                 GAsyncResult *res,
+                                 GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -996,23 +846,22 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

@@ -1020,12 +869,12 @@ 
void
 cd_device_make_profile_default (CdDevice *device,
                                 CdProfile *profile,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Makes an already added profile default for a device.

-

Parameters

+

Parameters

@@ -1045,7 +894,7 @@ - + @@ -1062,18 +911,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_device_make_profile_default_finish ()

-
gboolean
+
gboolean
 cd_device_make_profile_default_finish (CdDevice *device,
-                                       GAsyncResult *res,
-                                       GError **error);

+                                       GAsyncResult *res,
+                                       GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1088,36 +937,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_device_profiling_inhibit ()

void
 cd_device_profiling_inhibit (CdDevice *device,
-                             GCancellable *cancellable,
-                             GAsyncReadyCallback callback,
-                             gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Sets up the device for profiling and causes no profiles to be returned if cd_device_get_profile_for_qualifiers_sync() is used.

-

Parameters

+

Parameters

@@ -1132,7 +980,7 @@ - + @@ -1149,18 +997,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_device_profiling_inhibit_finish ()

-
gboolean
+
gboolean
 cd_device_profiling_inhibit_finish (CdDevice *device,
-                                    GAsyncResult *res,
-                                    GError **error);

+                                    GAsyncResult *res,
+                                    GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1175,36 +1023,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_device_set_enabled ()

void
 cd_device_set_enabled (CdDevice *device,
-                       gboolean enabled,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ gboolean enabled, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Enables or disables a device.

-

Parameters

+

Parameters

@@ -1224,7 +1071,7 @@ - + @@ -1241,18 +1088,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.26

+

Since: 0.1.26

cd_device_set_enabled_finish ()

-
gboolean
+
gboolean
 cd_device_set_enabled_finish (CdDevice *device,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1267,36 +1114,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.26

+

Since: 0.1.26

cd_device_profiling_uninhibit ()

void
 cd_device_profiling_uninhibit (CdDevice *device,
-                               GCancellable *cancellable,
-                               GAsyncReadyCallback callback,
-                               gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Restores the device after profiling and causes normal profiles to be returned if cd_device_get_profile_for_qualifiers_sync() is used.

-

Parameters

+

Parameters

@@ -1311,7 +1157,7 @@ - + @@ -1328,18 +1174,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_device_profiling_uninhibit_finish ()

-
gboolean
+
gboolean
 cd_device_profiling_uninhibit_finish (CdDevice *device,
-                                      GAsyncResult *res,
-                                      GError **error);

+                                      GAsyncResult *res,
+                                      GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1354,36 +1200,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_device_get_profile_for_qualifiers ()

void
 cd_device_get_profile_for_qualifiers (CdDevice *device,
-                                      const gchar **qualifiers,
-                                      GCancellable *cancellable,
-                                      GAsyncReadyCallback callback,
-                                      gpointer user_data);
+ const gchar **qualifiers, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets the prefered profile for some qualifiers.

-

Parameters

+

Parameters

@@ -1403,7 +1248,7 @@ - + @@ -1420,7 +1265,7 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

@@ -1428,11 +1273,11 @@ 
CdProfile *
 cd_device_get_profile_for_qualifiers_finish
                                (CdDevice *device,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1447,23 +1292,23 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

@@ -1471,12 +1316,12 @@ 
void
 cd_device_get_profile_relation (CdDevice *device,
                                 CdProfile *profile,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets the property relationship to the device.

-

Parameters

+

Parameters

@@ -1496,7 +1341,7 @@ - + @@ -1513,18 +1358,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_device_get_profile_relation_finish ()

CdDeviceRelation
 cd_device_get_profile_relation_finish (CdDevice *device,
-                                       GAsyncResult *res,
-                                       GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -1539,32 +1384,31 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_device_get_id ()

-
const gchar *
+
const gchar *
 cd_device_get_id (CdDevice *device);

 
Gets the device ID.

 

-
Parameters

+
Parameters

 
@@ -1579,20 +1423,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.0

+
Since: 0.1.0

cd_device_get_model ()

-
const gchar *
+
const gchar *
 cd_device_get_model (CdDevice *device);

 
Gets the device model.

 

-
Parameters

+
Parameters

 
@@ -1607,20 +1450,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.0

+
Since: 0.1.0

cd_device_get_vendor ()

-
const gchar *
+
const gchar *
 cd_device_get_vendor (CdDevice *device);

 
Gets the device vendor.

 

-
Parameters

+
Parameters

 
@@ -1635,20 +1477,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.1

+
Since: 0.1.1

cd_device_get_serial ()

-
const gchar *
+
const gchar *
 cd_device_get_serial (CdDevice *device);

 
Gets the device serial number.

 

-
Parameters

+
Parameters

 
@@ -1663,20 +1504,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.0

+
Since: 0.1.0

cd_device_get_seat ()

-
const gchar *
+
const gchar *
 cd_device_get_seat (CdDevice *device);

 
Gets the device seat identifier.

 

-
Parameters

+
Parameters

 
@@ -1691,20 +1531,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.24

+
Since: 0.1.24

cd_device_get_format ()

-
const gchar *
+
const gchar *
 cd_device_get_format (CdDevice *device);

 
Gets the device format.

 

-
Parameters

+
Parameters

 
@@ -1719,20 +1558,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.9

+
Since: 0.1.9

cd_device_get_profiling_inhibitors ()

-
const gchar **
+
const gchar **
 cd_device_get_profiling_inhibitors (CdDevice *device);

 
Gets any profiling inhibitors for the device.

 

-
Parameters

+
Parameters

 
@@ -1747,20 +1585,20 @@
 

 
 


 

 

-
Returns

-
 A strv, or NULL for invalid. 

+
Returns

+
 A strv, or NULL for invalid. 

 
[transfer none]

 

-
Since 0.1.17

+
Since: 0.1.17

cd_device_get_created ()

-
guint64
+
guint64
 cd_device_get_created (CdDevice *device);

 
Gets the device creation date.

 

-
Parameters

+
Parameters

 
@@ -1775,20 +1613,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 A value in microseconds, or 0 for invalid

-

 

-
Since 0.1.0

+
Since: 0.1.0

cd_device_get_modified ()

-
guint64
+
guint64
 cd_device_get_modified (CdDevice *device);

 
Gets the device modified date.

 

-
Parameters

+
Parameters

 
@@ -1803,11 +1640,10 @@
 

 
 


 

 

-
Returns

+
Returns

 
 A value in microseconds, or 0 for invalid

-

 

-
Since 0.1.1

+
Since: 0.1.1
@@ -1816,7 +1652,7 @@ cd_device_get_kind (CdDevice *device);

Gets the device kind.

-

Parameters

+

Parameters

@@ -1831,11 +1667,10 @@
-

Returns

+

Returns

A device kind, e.g. CD_DEVICE_KIND_DISPLAY

-

-

Since 0.1.0

+

Since: 0.1.0

@@ -1844,7 +1679,7 @@ cd_device_get_colorspace (CdDevice *device);

Gets the device colorspace.

-

Parameters

+

Parameters

@@ -1859,11 +1694,10 @@
-

Returns

+

Returns

A colorspace, e.g. CD_COLORSPACE_RGB

-

-

Since 0.1.1

+

Since: 0.1.1

@@ -1872,7 +1706,7 @@ cd_device_get_mode (CdDevice *device);

Gets the device mode.

-

Parameters

+

Parameters

@@ -1887,20 +1721,19 @@
-

Returns

+

Returns

A colorspace, e.g. CD_DEVICE_MODE_VIRTUAL

-

-

Since 0.1.2

+

Since: 0.1.2

cd_device_get_enabled ()

-
gboolean
+
gboolean
 cd_device_get_enabled (CdDevice *device);

 
Gets the device enabled state.

 

-
Parameters

+
Parameters

 
@@ -1915,21 +1748,20 @@
 

 
 


 

 

-
Returns

-
 TRUE if the device is enabled

-

+
Returns

+
 TRUE if the device is enabled

 

-
Since 0.1.26

+
Since: 0.1.26

cd_device_get_embedded ()

-
gboolean
+
gboolean
 cd_device_get_embedded (CdDevice *device);

 
Returns if the device is embedded in the computer and cannot be
 removed.

 

-
Parameters

+
Parameters

 
@@ -1944,11 +1776,10 @@
 

 
 


 

 

-
Returns

-
 TRUE if embedded.

-

+
Returns

+
 TRUE if embedded.

 

-
Since 0.1.27

+
Since: 0.1.27
@@ -1957,7 +1788,7 @@ cd_device_get_scope (CdDevice *device);

Gets the device scope.

-

Parameters

+

Parameters

@@ -1972,20 +1803,19 @@
-

Returns

+

Returns

An object scope, e.g. CD_OBJECT_SCOPE_TEMP

-

-

Since 0.1.10

+

Since: 0.1.10

cd_device_get_owner ()

-
guint
+
guint
 cd_device_get_owner (CdDevice *device);

 
Gets the device owner.

 

-
Parameters

+
Parameters

 
@@ -2000,20 +1830,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The UID of the user that created the device

-

 

-
Since 0.1.13

+
Since: 0.1.13

cd_device_get_profiles ()

-
GPtrArray *
+
GPtrArray *
 cd_device_get_profiles (CdDevice *device);

 
Gets the device profiles.

 

-
Parameters

+
Parameters

 
@@ -2028,11 +1857,11 @@
 

 
 


 

 

-
Returns

+
Returns

 
 An array of CdProfile's. 

 
[element-type CdProfile][transfer container]

 

-
Since 0.1.0

+
Since: 0.1.0
@@ -2042,7 +1871,7 @@

Gets the default device profile. A profile will not be returned if the device is being profiled or is disabled.

-

Parameters

+

Parameters

@@ -2057,20 +1886,20 @@
-

Returns

+

Returns

A CdProfile's or NULL.

[transfer full]

-

Since 0.1.1

+

Since: 0.1.1

cd_device_get_object_path ()

-
const gchar *
+
const gchar *
 cd_device_get_object_path (CdDevice *device);

 
Gets the object path for the device.

 

-
Parameters

+
Parameters

 
@@ -2085,20 +1914,19 @@
 

 
 


 

 

-
Returns

-
 the object path, or NULL

-

+
Returns

+
 the object path, or NULL

 

-
Since 0.1.0

+
Since: 0.1.0

cd_device_get_metadata ()

-
GHashTable *
+
GHashTable *
 cd_device_get_metadata (CdDevice *device);

 
Returns the device metadata.

 

-
Parameters

+
Parameters

 
@@ -2113,22 +1941,22 @@
 

 
 


 

 

-
Returns

+
Returns

 
 a
-GHashTable. 

+GHashTable. 

 
[transfer container][element-type utf8 utf8]

 

-
Since 0.1.5

+
Since: 0.1.5

cd_device_get_metadata_item ()

-
const gchar *
+
const gchar *
 cd_device_get_metadata_item (CdDevice *device,
-                             const gchar *key);

+                             const gchar *key);

Returns the device metadata for a specific key.

-

Parameters

+

Parameters

@@ -2150,21 +1978,20 @@
-

Returns

-

the metadata value, or NULL if not set.

-

+

Returns

+

the metadata value, or NULL if not set.

-

Since 0.1.5

+

Since: 0.1.5

cd_device_set_object_path ()

void
 cd_device_set_object_path (CdDevice *device,
-                           const gchar *object_path);
+ const gchar *object_path);

Sets the object path of the device.

-

Parameters

+

Parameters

@@ -2185,16 +2012,16 @@
-

Since 0.1.8

+

Since: 0.1.8

cd_device_get_connected ()

-
gboolean
+
gboolean
 cd_device_get_connected (CdDevice *device);

 
Gets if the device has been connected.

 

-
Parameters

+
Parameters

 
@@ -2209,20 +2036,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if properties are valid

-

+
Returns

+
 TRUE if properties are valid

 

-
Since 0.1.9

+
Since: 0.1.9

cd_device_to_string ()

-
gchar *
+
gchar *
 cd_device_to_string (CdDevice *device);

 
Converts the device to a string description.

 

-
Parameters

+
Parameters

 
@@ -2237,21 +2063,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 text representation of CdDevice

-

 

-
Since 0.1.0

+
Since: 0.1.0

cd_device_equal ()

-
gboolean
+
gboolean
 cd_device_equal (CdDevice *device1,
                  CdDevice *device2);

 
Tests two devices for equality.

 

-
Parameters

+
Parameters

 
@@ -2273,11 +2098,10 @@
 

 
 


 

 

-
Returns

-
 TRUE if the devices are the same device

-

+
Returns

+
 TRUE if the devices are the same device

 

-
Since 0.1.8

+
Since: 0.1.8
@@ -2300,6 +2124,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-device-sync.html colord-1.3.2/doc/api/html/colord-cd-device-sync.html --- colord-1.2.12/doc/api/html/colord-cd-device-sync.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-device-sync.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@ -gboolean +gboolean cd_device_connect_sync () @@ -49,7 +49,7 @@ -gboolean +gboolean cd_device_set_property_sync () @@ -57,7 +57,7 @@ -gboolean +gboolean cd_device_add_profile_sync () @@ -65,7 +65,7 @@ -gboolean +gboolean cd_device_remove_profile_sync () @@ -81,7 +81,7 @@ -gboolean +gboolean cd_device_make_profile_default_sync () @@ -89,7 +89,7 @@ -gboolean +gboolean cd_device_profiling_inhibit_sync () @@ -97,7 +97,7 @@ -gboolean +gboolean cd_device_profiling_uninhibit_sync () @@ -113,7 +113,7 @@ -gboolean +gboolean cd_device_set_enabled_sync () @@ -121,7 +121,7 @@ -gboolean +gboolean cd_device_set_model_sync () @@ -129,7 +129,7 @@ -gboolean +gboolean cd_device_set_serial_sync () @@ -137,7 +137,7 @@ -gboolean +gboolean cd_device_set_vendor_sync () @@ -145,7 +145,7 @@ -gboolean +gboolean cd_device_set_kind_sync () @@ -153,7 +153,7 @@ -gboolean +gboolean cd_device_set_colorspace_sync () @@ -161,7 +161,7 @@ -gboolean +gboolean cd_device_set_mode_sync () @@ -180,15 +180,15 @@

Functions

cd_device_connect_sync ()

-
gboolean
+
gboolean
 cd_device_connect_sync (CdDevice *device,
-                        GCancellable *cancellable,
-                        GError **error);

+                        GCancellable *cancellable,
+                        GError **error);

Connects to the object and fills up initial properties.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -203,38 +203,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.8

+

Since: 0.1.8

cd_device_set_property_sync ()

-
gboolean
+
gboolean
 cd_device_set_property_sync (CdDevice *device,
-                             const gchar *key,
-                             const gchar *value,
-                             GCancellable *cancellable,
-                             GError **error);

+                             const gchar *key,
+                             const gchar *value,
+                             GCancellable *cancellable,
+                             GError **error);

Sets an object property.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -259,38 +258,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.8

+

Since: 0.1.8

cd_device_add_profile_sync ()

-
gboolean
+
gboolean
 cd_device_add_profile_sync (CdDevice *device,
                             CdDeviceRelation relation,
                             CdProfile *profile,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GCancellable *cancellable,
+                            GError **error);

Adds a profile to a device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -315,37 +313,36 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.3

+

Since: 0.1.3

cd_device_remove_profile_sync ()

-
gboolean
+
gboolean
 cd_device_remove_profile_sync (CdDevice *device,
                                CdProfile *profile,
-                               GCancellable *cancellable,
-                               GError **error);

+                               GCancellable *cancellable,
+                               GError **error);

Removes a profile from a device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -365,23 +362,22 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.2

+

Since: 0.1.2

@@ -389,14 +385,14 @@ 
CdProfile *
 cd_device_get_profile_for_qualifiers_sync
                                (CdDevice *device,
-                                const gchar **qualifiers,
-                                GCancellable *cancellable,
-                                GError **error);
+ const gchar **qualifiers, + GCancellable *cancellable, + GError **error);

Gets the prefered profile for some qualifiers.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -416,37 +412,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

a CdProfile or NULL.

+

Returns

+

a CdProfile or NULL.

[transfer full]

-

Since 0.1.8

+

Since: 0.1.8

cd_device_make_profile_default_sync ()

-
gboolean
+
gboolean
 cd_device_make_profile_default_sync (CdDevice *device,
                                      CdProfile *profile,
-                                     GCancellable *cancellable,
-                                     GError **error);

+                                     GCancellable *cancellable,
+                                     GError **error);

Makes an already added profile default for a device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -466,37 +462,36 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.8

+

Since: 0.1.8

cd_device_profiling_inhibit_sync ()

-
gboolean
+
gboolean
 cd_device_profiling_inhibit_sync (CdDevice *device,
-                                  GCancellable *cancellable,
-                                  GError **error);

+                                  GCancellable *cancellable,
+                                  GError **error);

Sets up the device for profiling and causes no profiles to be returned if cd_device_get_profile_for_qualifiers_sync() is used.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -511,37 +506,36 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.1

+

Since: 0.1.1

cd_device_profiling_uninhibit_sync ()

-
gboolean
+
gboolean
 cd_device_profiling_uninhibit_sync (CdDevice *device,
-                                    GCancellable *cancellable,
-                                    GError **error);

+                                    GCancellable *cancellable,
+                                    GError **error);

Sets up the device for profiling and causes no profiles to be returned if cd_device_get_profile_for_qualifiers_sync() is used.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -556,23 +550,22 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.1

+

Since: 0.1.1

@@ -580,13 +573,13 @@ 
CdDeviceRelation
 cd_device_get_profile_relation_sync (CdDevice *device,
                                      CdProfile *profile,
-                                     GCancellable *cancellable,
-                                     GError **error);
+ GCancellable *cancellable, + GError **error);

Gets the property relationship to the device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -606,37 +599,36 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.8

+

Since: 0.1.8

cd_device_set_enabled_sync ()

-
gboolean
+
gboolean
 cd_device_set_enabled_sync (CdDevice *device,
-                            gboolean enabled,
-                            GCancellable *cancellable,
-                            GError **error);

+                            gboolean enabled,
+                            GCancellable *cancellable,
+                            GError **error);

Enables or disables a device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -656,37 +648,36 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.26

+

Since: 0.1.26

cd_device_set_model_sync ()

-
gboolean
+
gboolean
 cd_device_set_model_sync (CdDevice *device,
-                          const gchar *value,
-                          GCancellable *cancellable,
-                          GError **error);

+                          const gchar *value,
+                          GCancellable *cancellable,
+                          GError **error);

Sets the device model.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -706,38 +697,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE and error +

Returns

+

TRUE for success, else FALSE and error is used

-

-

Since 0.1.0

+

Since: 0.1.0

cd_device_set_serial_sync ()

-
gboolean
+
gboolean
 cd_device_set_serial_sync (CdDevice *device,
-                           const gchar *value,
-                           GCancellable *cancellable,
-                           GError **error);

+                           const gchar *value,
+                           GCancellable *cancellable,
+                           GError **error);

Sets the device serial number.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -757,38 +747,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE and error +

Returns

+

TRUE for success, else FALSE and error is used

-

-

Since 0.1.1

+

Since: 0.1.1

cd_device_set_vendor_sync ()

-
gboolean
+
gboolean
 cd_device_set_vendor_sync (CdDevice *device,
-                           const gchar *value,
-                           GCancellable *cancellable,
-                           GError **error);

+                           const gchar *value,
+                           GCancellable *cancellable,
+                           GError **error);

Sets the device vendor.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -808,38 +797,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE and error +

Returns

+

TRUE for success, else FALSE and error is used

-

-

Since 0.1.1

+

Since: 0.1.1

cd_device_set_kind_sync ()

-
gboolean
+
gboolean
 cd_device_set_kind_sync (CdDevice *device,
                          CdDeviceKind kind,
-                         GCancellable *cancellable,
-                         GError **error);

+                         GCancellable *cancellable,
+                         GError **error);

Sets the device kind.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -859,38 +847,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE and error +

Returns

+

TRUE for success, else FALSE and error is used

-

-

Since 0.1.0

+

Since: 0.1.0

cd_device_set_colorspace_sync ()

-
gboolean
+
gboolean
 cd_device_set_colorspace_sync (CdDevice *device,
                                CdColorspace colorspace,
-                               GCancellable *cancellable,
-                               GError **error);

+                               GCancellable *cancellable,
+                               GError **error);

Sets the device kind.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -910,38 +897,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE and error +

Returns

+

TRUE for success, else FALSE and error is used

-

-

Since 0.1.1

+

Since: 0.1.1

cd_device_set_mode_sync ()

-
gboolean
+
gboolean
 cd_device_set_mode_sync (CdDevice *device,
                          CdDeviceMode mode,
-                         GCancellable *cancellable,
-                         GError **error);

+                         GCancellable *cancellable,
+                         GError **error);

Sets the device mode.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -961,24 +947,23 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE and error +

Returns

+

TRUE for success, else FALSE and error is used

-

-

Since 0.1.2

+

Since: 0.1.2

@@ -986,6 +971,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-dom.html colord-1.3.2/doc/api/html/colord-cd-dom.html --- colord-1.2.12/doc/api/html/colord-cd-dom.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-dom.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,71 +41,7 @@ -void - - -(*_cd_dom_reserved1) () - - - - -void - - -(*_cd_dom_reserved2) () - - - - -void - - -(*_cd_dom_reserved3) () - - - - -void - - -(*_cd_dom_reserved4) () - - - - -void - - -(*_cd_dom_reserved5) () - - - - -void - - -(*_cd_dom_reserved6) () - - - - -void - - -(*_cd_dom_reserved7) () - - - - -void - - -(*_cd_dom_reserved8) () - - - - -GQuark +GQuark cd_dom_error_quark () @@ -121,7 +57,7 @@ -gchar * +gchar * cd_dom_to_string () @@ -129,28 +65,28 @@ -gboolean +gboolean cd_dom_parse_xml_data () -const GNode * +const GNode * cd_dom_get_node () -const gchar * +const gchar * cd_dom_get_node_name () -const gchar * +const gchar * cd_dom_get_node_data () @@ -158,7 +94,7 @@ -gint +gint cd_dom_get_node_data_as_int () @@ -166,14 +102,14 @@ -gdouble +gdouble cd_dom_get_node_data_as_double () -const gchar * +const gchar * cd_dom_get_node_attribute () @@ -181,7 +117,7 @@ -gboolean +gboolean cd_dom_get_node_rgb () @@ -189,7 +125,7 @@ -gboolean +gboolean cd_dom_get_node_yxy () @@ -197,7 +133,7 @@ -gboolean +gboolean cd_dom_get_node_lab () @@ -205,7 +141,7 @@ -GHashTable * +GHashTable * cd_dom_get_node_localized () @@ -239,79 +175,14 @@

Functions

-

_cd_dom_reserved1 ()

-
void
-(*_cd_dom_reserved1) (void);
-

-

-
-
-
-

_cd_dom_reserved2 ()

-
void
-(*_cd_dom_reserved2) (void);
-

-

-
-
-
-

_cd_dom_reserved3 ()

-
void
-(*_cd_dom_reserved3) (void);
-

-

-
-
-
-

_cd_dom_reserved4 ()

-
void
-(*_cd_dom_reserved4) (void);
-

-

-
-
-
-

_cd_dom_reserved5 ()

-
void
-(*_cd_dom_reserved5) (void);
-

-

-
-
-
-

_cd_dom_reserved6 ()

-
void
-(*_cd_dom_reserved6) (void);
-

-

-
-
-
-

_cd_dom_reserved7 ()

-
void
-(*_cd_dom_reserved7) (void);
-

-

-
-
-
-

_cd_dom_reserved8 ()

-
void
-(*_cd_dom_reserved8) (void);
-

-

-
-
-

cd_dom_error_quark ()

-
GQuark
+
GQuark
 cd_dom_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.31

+
Since: 0.1.31
@@ -320,20 +191,19 @@ cd_dom_new (void);

Creates a new CdDom object.

-

Returns

+

Returns

a new CdDom object.

-

-

Since 0.1.31

+

Since: 0.1.31

cd_dom_to_string ()

-
gchar *
+
gchar *
 cd_dom_to_string (CdDom *dom);

 
Returns a string representation of the DOM tree.

 

-
Parameters

+
Parameters

 
@@ -348,23 +218,22 @@
 

 
 


 

 

-
Returns

+
Returns

 
 an allocated string

-

 

-
Since 0.1.31

+
Since: 0.1.31

cd_dom_parse_xml_data ()

-
gboolean
+
gboolean
 cd_dom_parse_xml_data (CdDom *dom,
-                       const gchar *data,
-                       gssize data_len,
-                       GError **error);

+                       const gchar *data,
+                       gssize data_len,
+                       GError **error);

Parses data into a DOM tree.

-

Parameters

+

Parameters

@@ -390,28 +259,24 @@ - +

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 0.1.31

+

Since: 0.1.31

cd_dom_get_node ()

-
const GNode *
+
const GNode *
 cd_dom_get_node (CdDom *dom,
-                 const GNode *root,
-                 const gchar *path);

+                 const GNode *root,
+                 const gchar *path);

Gets a node from the DOM tree.

-

Parameters

+

Parameters

@@ -426,7 +291,7 @@ - + @@ -438,20 +303,19 @@

root

a root node, or NULL

a root node, or NULL

  
-

Returns

-

A GNode, or NULL if not found

-

+

Returns

+

A GNode, or NULL if not found

-

Since 0.1.31

+

Since: 0.1.31

cd_dom_get_node_name ()

-
const gchar *
-cd_dom_get_node_name (const GNode *node);
+
const gchar *
+cd_dom_get_node_name (const GNode *node);

Gets the node name, e.g. "body"

-

Parameters

+

Parameters

@@ -460,26 +324,25 @@ - +

node

a GNode

a GNode

  
-

Returns

+

Returns

string value

-

-

Since 0.1.31

+

Since: 0.1.31

cd_dom_get_node_data ()

-
const gchar *
-cd_dom_get_node_data (const GNode *node);
+
const gchar *
+cd_dom_get_node_data (const GNode *node);

Gets the node data, e.g. "paragraph text"

-

Parameters

+

Parameters

@@ -488,26 +351,25 @@ - +

node

a GNode

a GNode

  
-

Returns

+

Returns

string value

-

-

Since 0.1.31

+

Since: 0.1.31

cd_dom_get_node_data_as_int ()

-
gint
-cd_dom_get_node_data_as_int (const GNode *node);
+
gint
+cd_dom_get_node_data_as_int (const GNode *node);

Gets the node data, e.g. 128

-

Parameters

+

Parameters

@@ -516,26 +378,25 @@ - +

node

a GNode

a GNode

  
-

Returns

-

signed integer value, or G_MAXINT for error

-

+

Returns

+

signed integer value, or G_MAXINT for error

-

Since 0.1.32

+

Since: 0.1.32

cd_dom_get_node_data_as_double ()

-
gdouble
-cd_dom_get_node_data_as_double (const GNode *node);
+
gdouble
+cd_dom_get_node_data_as_double (const GNode *node);

Gets the node data, e.g. 7.4

-

Parameters

+

Parameters

@@ -544,27 +405,26 @@ - +

node

a GNode

a GNode

  
-

Returns

-

floating point value, or G_MAXDOUBLE for error

-

+

Returns

+

floating point value, or G_MAXDOUBLE for error

-

Since 0.1.32

+

Since: 0.1.32

cd_dom_get_node_attribute ()

-
const gchar *
-cd_dom_get_node_attribute (const GNode *node,
-                           const gchar *key);
+
const gchar *
+cd_dom_get_node_attribute (const GNode *node,
+                           const gchar *key);

Gets a node attribute, e.g. "false"

-

Parameters

+

Parameters

@@ -573,27 +433,26 @@ - +

node

a GNode

a GNode

  
-

Returns

+

Returns

string value

-

-

Since 0.1.31

+

Since: 0.1.31

cd_dom_get_node_rgb ()

-
gboolean
-cd_dom_get_node_rgb (const GNode *node,
+
gboolean
+cd_dom_get_node_rgb (const GNode *node,
                      CdColorRGB *rgb);

 
Extracts a RGB color value from the DOM tree

 

-
Parameters

+
Parameters

 
@@ -603,7 +462,7 @@
 
-
+
@@ -615,21 +474,20 @@
 

 
 

 

 
node
a GNode
a GNode

  
 

 

 

 

-
Returns

-
 TRUE if the color was parsed successfully

-

+
Returns

+
 TRUE if the color was parsed successfully

 

-
Since 0.1.31

+
Since: 0.1.31

cd_dom_get_node_yxy ()

-
gboolean
-cd_dom_get_node_yxy (const GNode *node,
+
gboolean
+cd_dom_get_node_yxy (const GNode *node,
                      CdColorYxy *yxy);

 
Extracts a Yxy color value from the DOM tree

 

-
Parameters

+
Parameters

 
@@ -639,7 +497,7 @@
 
-
+
@@ -651,21 +509,20 @@
 

 
 

 

 
node
a GNode
a GNode

  
 

 

 

 

-
Returns

-
 TRUE if the color was parsed successfully

-

+
Returns

+
 TRUE if the color was parsed successfully

 

-
Since 0.1.31

+
Since: 0.1.31

cd_dom_get_node_lab ()

-
gboolean
-cd_dom_get_node_lab (const GNode *node,
+
gboolean
+cd_dom_get_node_lab (const GNode *node,
                      CdColorLab *lab);

 
Extracts a Lab color value from the DOM tree

 

-
Parameters

+
Parameters

 
@@ -675,7 +532,7 @@
 
-
+
@@ -687,21 +544,20 @@
 

 
 

 

 
node
a GNode
a GNode

  
 

 

 

 

-
Returns

-
 TRUE if the color was parsed successfully

-

+
Returns

+
 TRUE if the color was parsed successfully

 

-
Since 0.1.31

+
Since: 0.1.31

cd_dom_get_node_localized ()

-
GHashTable *
-cd_dom_get_node_localized (const GNode *node,
-                           const gchar *key);
+
GHashTable *
+cd_dom_get_node_localized (const GNode *node,
+                           const gchar *key);

Extracts localized values from the DOM tree

-

Parameters

+

Parameters

@@ -711,7 +567,7 @@ - + @@ -723,11 +579,11 @@

node

a GNode

a GNode

  
-

Returns

+

Returns

A hash table with the locale (e.g. en_GB) as the key.

[transfer full]

-

Since 0.1.31

+

Since: 0.1.31

@@ -750,6 +606,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-icc.html colord-1.3.2/doc/api/html/colord-cd-icc.html --- colord-1.2.12/doc/api/html/colord-cd-icc.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-icc.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,71 +41,7 @@ -void - - -(*_cd_icc_reserved1) () - - - - -void - - -(*_cd_icc_reserved2) () - - - - -void - - -(*_cd_icc_reserved3) () - - - - -void - - -(*_cd_icc_reserved4) () - - - - -void - - -(*_cd_icc_reserved5) () - - - - -void - - -(*_cd_icc_reserved6) () - - - - -void - - -(*_cd_icc_reserved7) () - - - - -void - - -(*_cd_icc_reserved8) () - - - - -GQuark +GQuark cd_icc_error_quark () @@ -121,7 +57,7 @@ -gboolean +gboolean cd_icc_load_data () @@ -129,7 +65,7 @@ -gboolean +gboolean cd_icc_load_file () @@ -137,7 +73,7 @@ -gboolean +gboolean cd_icc_load_fd () @@ -145,7 +81,7 @@ -gboolean +gboolean cd_icc_load_handle () @@ -153,7 +89,7 @@ -GBytes * +GBytes * cd_icc_save_data () @@ -161,7 +97,7 @@ -gboolean +gboolean cd_icc_save_file () @@ -169,7 +105,7 @@ -gboolean +gboolean cd_icc_save_default () @@ -177,7 +113,7 @@ -gchar * +gchar * cd_icc_to_string () @@ -185,7 +121,7 @@ -gpointer +gpointer cd_icc_get_handle () @@ -193,7 +129,7 @@ -gpointer +gpointer cd_icc_get_context () @@ -201,14 +137,14 @@ -guint32 +guint32 cd_icc_get_size () -const gchar * +const gchar * cd_icc_get_filename () @@ -224,7 +160,7 @@ -gdouble +gdouble cd_icc_get_version () @@ -272,14 +208,14 @@ -GHashTable * +GHashTable * cd_icc_get_metadata () -const gchar * +const gchar * cd_icc_get_metadata_item () @@ -303,7 +239,7 @@ -GPtrArray * +GPtrArray * cd_icc_get_named_colors () @@ -311,7 +247,7 @@ -gboolean +gboolean cd_icc_get_can_delete () @@ -319,28 +255,28 @@ -GDateTime * +GDateTime * cd_icc_get_created () -const gchar * +const gchar * cd_icc_get_checksum () -const gchar * +const gchar * cd_icc_get_description () -const gchar * +const gchar * cd_icc_get_characterization_data () @@ -355,21 +291,21 @@ -const gchar * +const gchar * cd_icc_get_copyright () -const gchar * +const gchar * cd_icc_get_manufacturer () -const gchar * +const gchar * cd_icc_get_model () @@ -469,7 +405,7 @@ -guint +guint cd_icc_get_temperature () @@ -477,7 +413,7 @@ -GArray * +GArray * cd_icc_get_warnings () @@ -485,7 +421,7 @@ -gboolean +gboolean cd_icc_create_from_edid () @@ -493,7 +429,7 @@ -gboolean +gboolean cd_icc_create_from_edid_data () @@ -501,7 +437,7 @@ -gboolean +gboolean cd_icc_create_default () @@ -509,7 +445,7 @@ -GPtrArray * +GPtrArray * cd_icc_get_vcgt () @@ -517,7 +453,7 @@ -gboolean +gboolean cd_icc_set_vcgt () @@ -525,7 +461,7 @@ -GPtrArray * +GPtrArray * cd_icc_get_response () @@ -533,7 +469,7 @@ -gchar ** +gchar ** cd_icc_get_tags () @@ -541,7 +477,7 @@ -GBytes * +GBytes * cd_icc_get_tag_data () @@ -549,7 +485,7 @@ -gboolean +gboolean cd_icc_set_tag_data () @@ -595,79 +531,14 @@

Functions

-

_cd_icc_reserved1 ()

-
void
-(*_cd_icc_reserved1) (void);
-

-

-
-
-
-

_cd_icc_reserved2 ()

-
void
-(*_cd_icc_reserved2) (void);
-

-

-
-
-
-

_cd_icc_reserved3 ()

-
void
-(*_cd_icc_reserved3) (void);
-

-

-
-
-
-

_cd_icc_reserved4 ()

-
void
-(*_cd_icc_reserved4) (void);
-

-

-
-
-
-

_cd_icc_reserved5 ()

-
void
-(*_cd_icc_reserved5) (void);
-

-

-
-
-
-

_cd_icc_reserved6 ()

-
void
-(*_cd_icc_reserved6) (void);
-

-

-
-
-
-

_cd_icc_reserved7 ()

-
void
-(*_cd_icc_reserved7) (void);
-

-

-
-
-
-

_cd_icc_reserved8 ()

-
void
-(*_cd_icc_reserved8) (void);
-

-

-
-
-

cd_icc_error_quark ()

-
GQuark
+
GQuark
 cd_icc_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.32

+
Since: 0.1.32
@@ -676,24 +547,23 @@ cd_icc_new (void);

Creates a new CdIcc object.

-

Returns

+

Returns

a new CdIcc object.

-

-

Since 0.1.32

+

Since: 0.1.32

cd_icc_load_data ()

-
gboolean
+
gboolean
 cd_icc_load_data (CdIcc *icc,
-                  const guint8 *data,
-                  gsize data_len,
+                  const guint8 *data,
+                  gsize data_len,
                   CdIccLoadFlags flags,
-                  GError **error);

+                  GError **error);

Loads an ICC profile from raw byte data.

-

Parameters

+

Parameters

@@ -724,30 +594,26 @@ - +

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_load_file ()

-
gboolean
+
gboolean
 cd_icc_load_file (CdIcc *icc,
-                  GFile *file,
+                  GFile *file,
                   CdIccLoadFlags flags,
-                  GCancellable *cancellable,
-                  GError **error);

+                  GCancellable *cancellable,
+                  GError **error);

Loads an ICC profile from a local or remote file.

-

Parameters

+

Parameters

@@ -762,7 +628,7 @@ - + @@ -772,34 +638,30 @@ - + - +

file

a GFile

a GFile

  

cancellable

A GCancellable or NULL

A GCancellable or NULL

  

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_load_fd ()

-
gboolean
+
gboolean
 cd_icc_load_fd (CdIcc *icc,
-                gint fd,
+                gint fd,
                 CdIccLoadFlags flags,
-                GError **error);

+                GError **error);

Loads an ICC profile from an open file descriptor.

-

Parameters

+

Parameters

@@ -824,26 +686,22 @@ - +

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_load_handle ()

-
gboolean
+
gboolean
 cd_icc_load_handle (CdIcc *icc,
-                    gpointer handle,
+                    gpointer handle,
                     CdIccLoadFlags flags,
-                    GError **error);

+                    GError **error);

Set the internal cmsHPROFILE instance. This may be required if you create the profile using cmsCreateRGBProfileTHR() and then want to use the functionality in CdIcc.

@@ -860,7 +718,7 @@ be called if cd_icc_load_file() has previously been used on the icc object.

-

Parameters

+

Parameters

@@ -885,29 +743,25 @@ - +

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 0.1.33

+

Since: 0.1.33

cd_icc_save_data ()

-
GBytes *
+
GBytes *
 cd_icc_save_data (CdIcc *icc,
                   CdIccSaveFlags flags,
-                  GError **error);

+                  GError **error);

Saves an ICC profile to an allocated memory location.

-

Return vale: A GBytes structure, or NULL for error

+

Return vale: A GBytes structure, or NULL for error

-

Parameters

+

Parameters

@@ -927,31 +781,27 @@ - +

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 1.0.2

+

Since: 1.0.2

cd_icc_save_file ()

-
gboolean
+
gboolean
 cd_icc_save_file (CdIcc *icc,
-                  GFile *file,
+                  GFile *file,
                   CdIccSaveFlags flags,
-                  GCancellable *cancellable,
-                  GError **error);

+                  GCancellable *cancellable,
+                  GError **error);

Saves an ICC profile to a local or remote file.

-

Return vale: TRUE for success.

+

Return vale: TRUE for success.

-

Parameters

+

Parameters

@@ -966,7 +816,7 @@ - + @@ -976,35 +826,31 @@ - + - +

file

a GFile

a GFile

  

cancellable

A GCancellable or NULL

A GCancellable or NULL

  

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_save_default ()

-
gboolean
+
gboolean
 cd_icc_save_default (CdIcc *icc,
                      CdIccSaveFlags flags,
-                     GCancellable *cancellable,
-                     GError **error);

+                     GCancellable *cancellable,
+                     GError **error);

Saves an ICC profile to the default per-user location.

-

Return vale: TRUE for success.

+

Return vale: TRUE for success.

-

Parameters

+

Parameters

@@ -1024,31 +870,27 @@ - + - +

cancellable

A GCancellable or NULL

A GCancellable or NULL

  

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 1.1.1

+

Since: 1.1.1

cd_icc_to_string ()

-
gchar *
+
gchar *
 cd_icc_to_string (CdIcc *icc);

 
Returns a string representation of the ICC profile.

 

-
Parameters

+
Parameters

 
@@ -1063,21 +905,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 an allocated string

-

 

-
Since 0.1.32

+
Since: 0.1.32

cd_icc_get_handle ()

-
gpointer
+
gpointer
 cd_icc_get_handle (CdIcc *icc);

 
Return the cmsHPROFILE instance used locally. This may be required if you
 are using the profile in a transform.

 

-
Parameters

+
Parameters

 
@@ -1092,7 +933,7 @@
 

 
 


 

 

-
Returns

+
Returns

 
 Do not call cmsCloseProfile() on this value!. 

 
[transfer none]

 

@@ -1100,12 +941,12 @@
 

 

 
cd_icc_get_context ()

-
gpointer
+
gpointer
 cd_icc_get_context (CdIcc *icc);

 
Return the cmsContext instance used locally. This may be required if you
 are using native LCMS calls and then cd_icc_load_handle().

 

-
Parameters

+
Parameters

 
@@ -1120,33 +961,32 @@
 

 
 


 

 

-
Returns

+
Returns

 
 Do not call cmsDeleteContext() on this value!. 

 
[transfer none]

 

-
Since 1.1.7

+
Since: 1.1.7

 

 

 

 
cd_icc_get_size ()

-
guint32
+
guint32
 cd_icc_get_size (CdIcc *icc);

 
Gets the ICC profile file size

 

-
Returns

+
Returns

 
 The size in bytes, or 0 for unknown.

-

 

-
Since 0.1.32

+
Since: 0.1.32

 

 

 

 
cd_icc_get_filename ()

-
const gchar *
+
const gchar *
 cd_icc_get_filename (CdIcc *icc);

 
Gets the filename of the ICC data, if one exists.

 

-
Parameters

+
Parameters

 
@@ -1161,22 +1001,21 @@
 

 
 


 

 

-
Returns

-
 A filename, or NULL

-

+
Returns

+
 A filename, or NULL

 

-
Since 0.1.32

+
Since: 0.1.32

 

 

 

 
cd_icc_set_filename ()

 
void
 cd_icc_set_filename (CdIcc *icc,
-                     const gchar *filename);

+                     const gchar *filename);

Sets the filename, which may be required if the ICC profile has been loaded using cd_icc_load_fd() from a disk cache.

-

Parameters

+

Parameters

@@ -1191,22 +1030,22 @@ - +

filename

a filename, or NULL

a filename, or NULL

  
-

Since 1.1.1

+

Since: 1.1.1

cd_icc_get_version ()

-
gdouble
+
gdouble
 cd_icc_get_version (CdIcc *icc);

 
Gets the ICC profile version, typically 2.1 or 4.2

 

-
Parameters

+
Parameters

 
@@ -1221,21 +1060,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 A floating point version number, or 0.0 for unknown

-

 

-
Since 0.1.32

+
Since: 0.1.32

cd_icc_set_version ()

void
 cd_icc_set_version (CdIcc *icc,
-                    gdouble version);
+ gdouble version);

Sets the profile version.

-

Parameters

+

Parameters

@@ -1256,7 +1094,7 @@
-

Since 0.1.32

+

Since: 0.1.32

@@ -1265,7 +1103,7 @@ cd_icc_get_kind (CdIcc *icc);

Gets the profile kind.

-

Parameters

+

Parameters

@@ -1280,11 +1118,10 @@
-

Returns

+

Returns

The kind, e.g. CD_PROFILE_KIND_INPUT

-

-

Since 0.1.32

+

Since: 0.1.32

@@ -1294,7 +1131,7 @@ CdProfileKind kind);

Sets the profile kind.

-

Parameters

+

Parameters

@@ -1315,7 +1152,7 @@
-

Since 0.1.32

+

Since: 0.1.32

@@ -1324,7 +1161,7 @@ cd_icc_get_colorspace (CdIcc *icc);

Gets the profile colorspace

-

Parameters

+

Parameters

@@ -1339,11 +1176,10 @@
-

Returns

+

Returns

The profile colorspace, e.g. CD_COLORSPACE_RGB

-

-

Since 0.1.32

+

Since: 0.1.32

@@ -1353,7 +1189,7 @@ CdColorspace colorspace);

Sets the colorspace kind.

-

Parameters

+

Parameters

@@ -1374,16 +1210,16 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_get_metadata ()

-
GHashTable *
+
GHashTable *
 cd_icc_get_metadata (CdIcc *icc);

 
Gets all the metadata from the ICC profile.

 

-
Parameters

+
Parameters

 
@@ -1398,21 +1234,21 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The profile metadata. 

 
[transfer container]

 

-
Since 0.1.32

+
Since: 0.1.32

cd_icc_get_metadata_item ()

-
const gchar *
+
const gchar *
 cd_icc_get_metadata_item (CdIcc *icc,
-                          const gchar *key);

+                          const gchar *key);

Gets an item of data from the ICC metadata store.

-

Parameters

+

Parameters

@@ -1434,23 +1270,22 @@
-

Returns

-

The dictionary data, or NULL if the key does not exist.

-

+

Returns

+

The dictionary data, or NULL if the key does not exist.

-

Since 0.1.32

+

Since: 0.1.32

cd_icc_add_metadata ()

void
 cd_icc_add_metadata (CdIcc *icc,
-                     const gchar *key,
-                     const gchar *value);
+ const gchar *key, + const gchar *value);

Sets an item of data to the profile metadata, overwriting it if it already exists.

-

Parameters

+

Parameters

@@ -1476,17 +1311,17 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_remove_metadata ()

void
 cd_icc_remove_metadata (CdIcc *icc,
-                        const gchar *key);
+ const gchar *key);

Removes an item of metadata.

-

Parameters

+

Parameters

@@ -1507,18 +1342,18 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_get_named_colors ()

-
GPtrArray *
+
GPtrArray *
 cd_icc_get_named_colors (CdIcc *icc);

 
Gets any named colors in the profile.
 This function will only return results if the profile was loaded with the
 CD_ICC_LOAD_FLAGS_NAMED_COLORS flag.

 

-
Parameters

+
Parameters

 
@@ -1533,22 +1368,22 @@
 

 
 


 

 

-
Returns

+
Returns

 
 An array of color swatches. 

 
[transfer container][element-type CdColorSwatch]

 

-
Since 0.1.32

+
Since: 0.1.32

cd_icc_get_can_delete ()

-
gboolean
+
gboolean
 cd_icc_get_can_delete (CdIcc *icc);

 
Finds out if the profile could be deleted.
 This is only applicable for profiles loaded with cd_icc_load_file() as
 obviously data and fd's cannot be sanely unlinked.

 

-
Parameters

+
Parameters

 
@@ -1563,20 +1398,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if g_file_delete() would likely work

-

+
Returns

+
 TRUE if g_file_delete() would likely work

 

-
Since 0.1.32

+
Since: 0.1.32

cd_icc_get_created ()

-
GDateTime *
+
GDateTime *
 cd_icc_get_created (CdIcc *icc);

 
Gets the ICC creation date and time.

 

-
Parameters

+
Parameters

 
@@ -1591,23 +1425,22 @@
 

 
 


 

 

-
Returns

-
 A GDateTime object, or NULL for not set

-

+
Returns

+
 A GDateTime object, or NULL for not set

 

-
Since 0.1.32

+
Since: 0.1.32

cd_icc_get_checksum ()

-
const gchar *
+
const gchar *
 cd_icc_get_checksum (CdIcc *icc);

 
Gets the profile checksum if one exists.
 This will either be the embedded profile ID, or the file checksum if
 the CdIcc object was loaded using cd_icc_load_data() or cd_icc_load_file()
 and the CD_ICC_LOAD_FLAGS_FALLBACK_MD5 flag is used.

 

-
Parameters

+
Parameters

 
@@ -1622,24 +1455,23 @@
 

 
 


 

 

-
Returns

-
 An embedded MD5 checksum, or NULL for not set

-

+
Returns

+
 An embedded MD5 checksum, or NULL for not set

 

-
Since 0.1.32

+
Since: 0.1.32

cd_icc_get_description ()

-
const gchar *
+
const gchar *
 cd_icc_get_description (CdIcc *icc,
-                        const gchar *locale,
-                        GError **error);

+                        const gchar *locale,
+                        GError **error);

Gets the profile description. If the translated text is not available in the selected locale then the default untranslated (en_US) text is returned.

-

Parameters

+

Parameters

@@ -1654,35 +1486,34 @@ - + - +

locale

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

The text as a UTF-8 string, or NULL of the locale is invalid +

Returns

+

The text as a UTF-8 string, or NULL of the locale is invalid or the tag does not exist.

-

-

Since 0.1.32

+

Since: 0.1.32

cd_icc_get_characterization_data ()

-
const gchar *
+
const gchar *
 cd_icc_get_characterization_data (CdIcc *icc);

 
Gets any characterization data used to build the profile.
 This function will only return results if the profile was loaded with the
 CD_ICC_LOAD_FLAGS_CHARACTERIZATION flag.

 

-
Parameters

+
Parameters

 
@@ -1697,21 +1528,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 TI3 string data

-

 

-
Since 1.1.1

+
Since: 1.1.1

cd_icc_set_characterization_data ()

void
 cd_icc_set_characterization_data (CdIcc *icc,
-                                  const gchar *data);
+ const gchar *data);

Sets the characterization data used to build the profile.

-

Parameters

+

Parameters

@@ -1726,26 +1556,26 @@ - +

data

TI3 string data, or NULL

TI3 string data, or NULL

  
-

Since 1.1.1

+

Since: 1.1.1

cd_icc_get_copyright ()

-
const gchar *
+
const gchar *
 cd_icc_get_copyright (CdIcc *icc,
-                      const gchar *locale,
-                      GError **error);

+                      const gchar *locale,
+                      GError **error);

Gets the profile copyright. If the translated text is not available in the selected locale then the default untranslated (en_US) text is returned.

-

Parameters

+

Parameters

@@ -1760,37 +1590,36 @@ - + - +

locale

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

The text as a UTF-8 string, or NULL of the locale is invalid +

Returns

+

The text as a UTF-8 string, or NULL of the locale is invalid or the tag does not exist.

-

-

Since 0.1.32

+

Since: 0.1.32

cd_icc_get_manufacturer ()

-
const gchar *
+
const gchar *
 cd_icc_get_manufacturer (CdIcc *icc,
-                         const gchar *locale,
-                         GError **error);

+                         const gchar *locale,
+                         GError **error);

Gets the profile manufacturer. If the translated text is not available in the selected locale then the default untranslated (en_US) text is returned.

-

Parameters

+

Parameters

@@ -1805,37 +1634,36 @@ - + - +

locale

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

The text as a UTF-8 string, or NULL of the locale is invalid +

Returns

+

The text as a UTF-8 string, or NULL of the locale is invalid or the tag does not exist.

-

-

Since 0.1.32

+

Since: 0.1.32

cd_icc_get_model ()

-
const gchar *
+
const gchar *
 cd_icc_get_model (CdIcc *icc,
-                  const gchar *locale,
-                  GError **error);

+                  const gchar *locale,
+                  GError **error);

Gets the profile model. If the translated text is not available in the selected locale then the default untranslated (en_US) text is returned.

-

Parameters

+

Parameters

@@ -1850,35 +1678,34 @@ - + - +

locale

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

The text as a UTF-8 string, or NULL of the locale is invalid +

Returns

+

The text as a UTF-8 string, or NULL of the locale is invalid or the tag does not exist.

-

-

Since 0.1.32

+

Since: 0.1.32

cd_icc_set_description ()

void
 cd_icc_set_description (CdIcc *icc,
-                        const gchar *locale,
-                        const gchar *value);
+ const gchar *locale, + const gchar *value);

Sets the profile description for a specific locale.

-

Parameters

+

Parameters

@@ -1893,7 +1720,7 @@ - + @@ -1904,17 +1731,17 @@

locale

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_set_description_items ()

void
 cd_icc_set_description_items (CdIcc *icc,
-                              GHashTable *values);
+ GHashTable *values);

Sets the profile descriptions for specific locales.

-

Parameters

+

Parameters

@@ -1935,18 +1762,18 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_set_copyright ()

void
 cd_icc_set_copyright (CdIcc *icc,
-                      const gchar *locale,
-                      const gchar *value);
+ const gchar *locale, + const gchar *value);

Sets the profile _copyright for a specific locale.

-

Parameters

+

Parameters

@@ -1961,7 +1788,7 @@ - + @@ -1972,17 +1799,17 @@

locale

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_set_copyright_items ()

void
 cd_icc_set_copyright_items (CdIcc *icc,
-                            GHashTable *values);
+ GHashTable *values);

Sets the profile copyrights for specific locales.

-

Parameters

+

Parameters

@@ -2003,18 +1830,18 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_set_manufacturer ()

void
 cd_icc_set_manufacturer (CdIcc *icc,
-                         const gchar *locale,
-                         const gchar *value);
+ const gchar *locale, + const gchar *value);

Sets the profile manufacturer for a specific locale.

-

Parameters

+

Parameters

@@ -2029,7 +1856,7 @@ - + @@ -2040,17 +1867,17 @@

locale

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_set_manufacturer_items ()

void
 cd_icc_set_manufacturer_items (CdIcc *icc,
-                               GHashTable *values);
+ GHashTable *values);

Sets the profile manufacturers for specific locales.

-

Parameters

+

Parameters

@@ -2071,18 +1898,18 @@
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_set_model ()

void
 cd_icc_set_model (CdIcc *icc,
-                  const gchar *locale,
-                  const gchar *value);
+ const gchar *locale, + const gchar *value);

Sets the profile model for a specific locale.

-

Parameters

+

Parameters

@@ -2097,7 +1924,7 @@ - + @@ -2108,17 +1935,17 @@

locale

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
-

Since 0.1.32

+

Since: 0.1.32

cd_icc_set_model_items ()

void
 cd_icc_set_model_items (CdIcc *icc,
-                        GHashTable *values);
+ GHashTable *values);

Sets the profile models for specific locales.

-

Parameters

+

Parameters

@@ -2139,7 +1966,7 @@
-

Since 0.1.32

+

Since: 0.1.32

@@ -2150,7 +1977,7 @@ This function will only return results if the profile was loaded with the CD_ICC_LOAD_FLAGS_PRIMARIES flag.

-

Parameters

+

Parameters

@@ -2165,11 +1992,10 @@
-

Returns

+

Returns

the CdColorXYZ value

-

-

Since 0.1.32

+

Since: 0.1.32

@@ -2180,7 +2006,7 @@ This function will only return results if the profile was loaded with the CD_ICC_LOAD_FLAGS_PRIMARIES flag.

-

Parameters

+

Parameters

@@ -2195,11 +2021,10 @@
-

Returns

+

Returns

the CdColorXYZ value

-

-

Since 0.1.32

+

Since: 0.1.32

@@ -2210,7 +2035,7 @@ This function will only return results if the profile was loaded with the CD_ICC_LOAD_FLAGS_PRIMARIES flag.

-

Parameters

+

Parameters

@@ -2225,11 +2050,10 @@
-

Returns

+

Returns

the CdColorXYZ value

-

-

Since 0.1.32

+

Since: 0.1.32

@@ -2240,7 +2064,7 @@ This function will only return results if the profile was loaded with the CD_ICC_LOAD_FLAGS_PRIMARIES flag.

-

Parameters

+

Parameters

@@ -2255,22 +2079,21 @@
-

Returns

+

Returns

the CdColorXYZ value

-

-

Since 0.1.32

+

Since: 0.1.32

cd_icc_get_temperature ()

-
guint
+
guint
 cd_icc_get_temperature (CdIcc *icc);

 
Gets the ICC color temperature, rounded to the nearest 100K.
 This function will only return results if the profile was loaded with the
 CD_ICC_LOAD_FLAGS_PRIMARIES flag.

 

-
Parameters

+
Parameters

 
@@ -2285,20 +2108,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The color temperature in Kelvin, or 0 for error.

-

 

-
Since 0.1.32

+
Since: 0.1.32

cd_icc_get_warnings ()

-
GArray *
+
GArray *
 cd_icc_get_warnings (CdIcc *icc);

 
Returns any warnings with profiles

 

-
Parameters

+
Parameters

 
@@ -2313,26 +2135,26 @@
 

 
 


 

 

-
Returns

+
Returns

 
 An array of warning values. 

 
[transfer container][element-type CdProfileWarning]

 

-
Since 0.1.34

+
Since: 0.1.34

cd_icc_create_from_edid ()

-
gboolean
+
gboolean
 cd_icc_create_from_edid (CdIcc *icc,
-                         gdouble gamma_value,
+                         gdouble gamma_value,
                          const CdColorYxy *red,
                          const CdColorYxy *green,
                          const CdColorYxy *blue,
                          const CdColorYxy *white,
-                         GError **error);

+                         GError **error);

Creates an ICC profile from EDID data.

-

Parameters

+

Parameters

@@ -2372,29 +2194,28 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

-

TRUE for success

-

+

Returns

+

TRUE for success

-

Since 0.1.32

+

Since: 0.1.32

cd_icc_create_from_edid_data ()

-
gboolean
+
gboolean
 cd_icc_create_from_edid_data (CdIcc *icc,
                               CdEdid *edid,
-                              GError **error);

+                              GError **error);

Creates an ICC profile from EDID data.

-

Parameters

+

Parameters

@@ -2414,28 +2235,27 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

-

TRUE for success

-

+

Returns

+

TRUE for success

-

Since 1.1.2

+

Since: 1.1.2

cd_icc_create_default ()

-
gboolean
+
gboolean
 cd_icc_create_default (CdIcc *icc,
-                       GError **error);

+                       GError **error);

Creates a default sRGB ICC profile.

-

Parameters

+

Parameters

@@ -2450,29 +2270,28 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

-

TRUE for success

-

+

Returns

+

TRUE for success

-

Since 1.1.2

+

Since: 1.1.2

cd_icc_get_vcgt ()

-
GPtrArray *
+
GPtrArray *
 cd_icc_get_vcgt (CdIcc *icc,
-                 guint size,
-                 GError **error);

+                 guint size,
+                 GError **error);

Gets the video card calibration data from the profile.

-

Parameters

+

Parameters

@@ -2492,30 +2311,30 @@ - +

error

A GError or NULL

A GError or NULL

  
-

Returns

-

VCGT data, or NULL for error.

+

Returns

+

VCGT data, or NULL for error.

[transfer container][element-type CdColorRGB]

-

Since 0.1.34

+

Since: 0.1.34

cd_icc_set_vcgt ()

-
gboolean
+
gboolean
 cd_icc_set_vcgt (CdIcc *icc,
-                 GPtrArray *vcgt,
-                 GError **error);

+                 GPtrArray *vcgt,
+                 GError **error);

Sets the Video Card Gamma Table from the profile.

-

Return vale: TRUE for success.

+

Return vale: TRUE for success.

-

Parameters

+

Parameters

@@ -2535,28 +2354,24 @@ - +

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 0.1.34

+

Since: 0.1.34

cd_icc_get_response ()

-
GPtrArray *
+
GPtrArray *
 cd_icc_get_response (CdIcc *icc,
-                     guint size,
-                     GError **error);

+                     guint size,
+                     GError **error);

Generates a response curve of a specified size.

-

Parameters

+

Parameters

@@ -2576,28 +2391,28 @@ - +

error

a valid GError, or NULL

a valid GError, or NULL

  
-

Returns

-

response data, or NULL for error.

+

Returns

+

response data, or NULL for error.

[transfer container][element-type CdColorRGB]

-

Since 0.1.34

+

Since: 0.1.34

cd_icc_get_tags ()

-
gchar **
+
gchar **
 cd_icc_get_tags (CdIcc *icc,
-                 GError **error);

+                 GError **error);

Returns the internal tag table. Most users do not need to do this.

-

Parameters

+

Parameters

@@ -2612,30 +2427,30 @@ - +

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

the tag tables as an array of strings.

[transfer full]

-

Since 1.1.6

+

Since: 1.1.6

cd_icc_get_tag_data ()

-
GBytes *
+
GBytes *
 cd_icc_get_tag_data (CdIcc *icc,
-                     const gchar *tag,
-                     GError **error);

+                     const gchar *tag,
+                     GError **error);

Returns the raw data for the specific tag. Most users do not need to do this.

-

Parameters

+

Parameters

@@ -2655,31 +2470,31 @@ - +

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

the data for the tag.

[transfer full]

-

Since 1.1.6

+

Since: 1.1.6

cd_icc_set_tag_data ()

-
gboolean
+
gboolean
 cd_icc_set_tag_data (CdIcc *icc,
-                     const gchar *tag,
-                     GBytes *data,
-                     GError **error);

+                     const gchar *tag,
+                     GBytes *data,
+                     GError **error);

Sets the raw data for the specific tag. Most users do not need to do this.

-

Parameters

+

Parameters

@@ -2704,17 +2519,13 @@ - +

error

A GError or NULL

A GError or NULL

  
-
-

Returns

-

-
-

Since 1.1.6

+

Since: 1.1.6

@@ -2739,7 +2550,7 @@

enum CdIccError

The ICC error code.

-

Members

+

Members

@@ -2819,7 +2630,7 @@

enum CdIccLoadFlags

Flags used when loading an ICC profile.

-

Members

+

Members

@@ -2885,14 +2696,14 @@
-

Since 0.1.32

+

Since: 0.1.32

enum CdIccSaveFlags

Flags used when saving an ICC profile.

-

Members

+

Members

@@ -2908,11 +2719,11 @@
-

Since 0.1.32

+

Since: 0.1.32

-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-icc-utils.html colord-1.3.2/doc/api/html/colord-cd-icc-utils.html --- colord-1.2.12/doc/api/html/colord-cd-icc-utils.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-icc-utils.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -40,7 +40,7 @@ -gboolean +gboolean cd_icc_utils_get_coverage () @@ -56,15 +56,15 @@

Functions

cd_icc_utils_get_coverage ()

-
gboolean
+
gboolean
 cd_icc_utils_get_coverage (CdIcc *icc,
                            CdIcc *icc_reference,
-                           gdouble *coverage,
-                           GError **error);

+                           gdouble *coverage,
+                           GError **error);

Gets the gamut coverage of two profiles where 0.5 would mean the gamut is half the size, and 2.0 would indicate the gamut is twice the size.

-

Parameters

+

Parameters

@@ -91,16 +91,15 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

+

Returns

TRUE for success

-

@@ -109,6 +108,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-interp-akima.html colord-1.3.2/doc/api/html/colord-cd-interp-akima.html --- colord-1.2.12/doc/api/html/colord-cd-interp-akima.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-interp-akima.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -60,11 +60,10 @@ cd_interp_akima_new (void);

Creates a new CdInterpAkima object.

-

Returns

+

Returns

a new CdInterp object.

-

-

Since 0.1.31

+

Since: 0.1.31

@@ -72,6 +71,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-interp.html colord-1.3.2/doc/api/html/colord-cd-interp.html --- colord-1.2.12/doc/api/html/colord-cd-interp.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-interp.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,87 +41,7 @@ -gboolean - - -(*prepare) () - - - - -gdouble - - -(*eval) () - - - - -void - - -(*_cd_interp_reserved1) () - - - - -void - - -(*_cd_interp_reserved2) () - - - - -void - - -(*_cd_interp_reserved3) () - - - - -void - - -(*_cd_interp_reserved4) () - - - - -void - - -(*_cd_interp_reserved5) () - - - - -void - - -(*_cd_interp_reserved6) () - - - - -void - - -(*_cd_interp_reserved7) () - - - - -void - - -(*_cd_interp_reserved8) () - - - - -GQuark +GQuark cd_interp_error_quark () @@ -137,7 +57,7 @@ -GArray * +GArray * cd_interp_get_x () @@ -145,7 +65,7 @@ -GArray * +GArray * cd_interp_get_y () @@ -153,7 +73,7 @@ -guint +guint cd_interp_get_size () @@ -169,7 +89,7 @@ -gboolean +gboolean cd_interp_prepare () @@ -177,14 +97,14 @@ -gdouble +gdouble cd_interp_eval () -const gchar * +const gchar * cd_interp_kind_to_string () @@ -227,106 +147,14 @@

Functions

-

prepare ()

-
gboolean
-(*prepare) (CdInterp *interp,
-            GError **error);
-

-

-
-

Returns

-

-
-
-
-
-

eval ()

-
gdouble
-(*eval) (CdInterp *interp,
-         gdouble value,
-         GError **error);
-

-

-
-

Returns

-

-
-
-
-
-

_cd_interp_reserved1 ()

-
void
-(*_cd_interp_reserved1) (void);
-

-

-
-
-
-

_cd_interp_reserved2 ()

-
void
-(*_cd_interp_reserved2) (void);
-

-

-
-
-
-

_cd_interp_reserved3 ()

-
void
-(*_cd_interp_reserved3) (void);
-

-

-
-
-
-

_cd_interp_reserved4 ()

-
void
-(*_cd_interp_reserved4) (void);
-

-

-
-
-
-

_cd_interp_reserved5 ()

-
void
-(*_cd_interp_reserved5) (void);
-

-

-
-
-
-

_cd_interp_reserved6 ()

-
void
-(*_cd_interp_reserved6) (void);
-

-

-
-
-
-

_cd_interp_reserved7 ()

-
void
-(*_cd_interp_reserved7) (void);
-

-

-
-
-
-

_cd_interp_reserved8 ()

-
void
-(*_cd_interp_reserved8) (void);
-

-

-
-
-

cd_interp_error_quark ()

-
GQuark
+
GQuark
 cd_interp_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.31

+
Since: 0.1.31
@@ -335,7 +163,7 @@ cd_interp_get_kind (CdInterp *interp);

Gets the kind of INTERP file.

-

Parameters

+

Parameters

@@ -350,16 +178,15 @@
-

Returns

+

Returns

a CdInterpKind, e.g CD_INTERP_KIND_AKIMA.

-

-

Since 0.1.31

+

Since: 0.1.31

cd_interp_get_x ()

-
GArray *
+
GArray *
 cd_interp_get_x (CdInterp *interp);

 
Gets the X data used the interpolation.

 
NOTE: this is only guaranteed to return the data inserted by
@@ -367,7 +194,7 @@
 
After prepating the CdInterp this data should be considered an
 implementation detail.

 

-
Parameters

+
Parameters

 
@@ -382,16 +209,16 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The X co-ordinate data. 

 
[transfer none][element-type gdouble]

 

-
Since 0.1.31

+
Since: 0.1.31

cd_interp_get_y ()

-
GArray *
+
GArray *
 cd_interp_get_y (CdInterp *interp);

 
Gets the Y data used the interpolation.

 
NOTE: this is only guaranteed to return the data inserted by
@@ -399,7 +226,7 @@
 
After prepating the CdInterp this data should be considered an
 implementation detail.

 

-
Parameters

+
Parameters

 
@@ -414,16 +241,16 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The Y co-ordinate data. 

 
[transfer none][element-type gdouble]

 

-
Since 0.1.31

+
Since: 0.1.31

cd_interp_get_size ()

-
guint
+
guint
 cd_interp_get_size (CdInterp *interp);

 
Gets the number of items of data added with cd_interp_insert().

 
NOTE: This method has to be called after cd_interp_prepare() and it returns
@@ -431,7 +258,7 @@
 If you need the updated private size then just use cd_interp_get_x() and
 read the size from that.

 

-
Parameters

+
Parameters

 
@@ -446,22 +273,21 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The original array size

-

 

-
Since 0.1.31

+
Since: 0.1.31

cd_interp_insert ()

void
 cd_interp_insert (CdInterp *interp,
-                  gdouble x,
-                  gdouble y);
+ gdouble x, + gdouble y);

Inserts data to be interpolated.

-

Parameters

+

Parameters

@@ -487,17 +313,17 @@
-

Since 0.1.31

+

Since: 0.1.31

cd_interp_prepare ()

-
gboolean
+
gboolean
 cd_interp_prepare (CdInterp *interp,
-                   GError **error);

+                   GError **error);

Prepares the data set so that cd_interp_eval() can be used.

-

Parameters

+

Parameters

@@ -512,24 +338,23 @@
-

Returns

-

TRUE for success

-

+

Returns

+

TRUE for success

-

Since 0.1.31

+

Since: 0.1.31

cd_interp_eval ()

-
gdouble
+
gdouble
 cd_interp_eval (CdInterp *interp,
-                gdouble value,
-                GError **error);

+                gdouble value,
+                GError **error);

Evaluate the interpolation function at a specific point. You must have called cd_interp_insert() and cd_interp_prepare() before calling this method.

-

Parameters

+

Parameters

@@ -549,28 +374,23 @@ - +

error

a GError or NULL

a GError or NULL

  
-

Returns

+

Returns

The Y co-ordinate, or -1 for error

-

-

Since 0.1.31

+

Since: 0.1.31

cd_interp_kind_to_string ()

-
const gchar *
+
const gchar *
 cd_interp_kind_to_string (CdInterpKind kind);

-

-
Returns

-

-
@@ -595,7 +415,7 @@

enum CdInterpError

Errors that can be thrown

-

Members

+

Members

@@ -617,7 +437,7 @@

enum CdInterpKind

The kind of interpolation.

-

Members

+

Members

@@ -642,6 +462,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-interp-linear.html colord-1.3.2/doc/api/html/colord-cd-interp-linear.html --- colord-1.2.12/doc/api/html/colord-cd-interp-linear.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-interp-linear.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -60,11 +60,10 @@ cd_interp_linear_new (void);

Creates a new CdInterpLinear object.

-

Returns

+

Returns

a new CdInterp object.

-

-

Since 0.1.31

+

Since: 0.1.31

@@ -72,6 +71,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-it8.html colord-1.3.2/doc/api/html/colord-cd-it8.html --- colord-1.2.12/doc/api/html/colord-cd-it8.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-it8.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,71 +41,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void - -(*_cd_it8_reserved1) () -
-void - -(*_cd_it8_reserved2) () -
-void - -(*_cd_it8_reserved3) () -
-void - -(*_cd_it8_reserved4) () -
-void - -(*_cd_it8_reserved5) () -
-void - -(*_cd_it8_reserved6) () -
-void - -(*_cd_it8_reserved7) () -
-void - -(*_cd_it8_reserved8) () -
-GQuark +GQuark cd_it8_error_quark () @@ -129,7 +65,7 @@
-gboolean +gboolean cd_it8_load_from_data () @@ -137,7 +73,7 @@
-gboolean +gboolean cd_it8_load_from_file () @@ -145,7 +81,7 @@
-gboolean +gboolean cd_it8_save_to_file () @@ -153,7 +89,7 @@
-gboolean +gboolean cd_it8_save_to_data () @@ -280,21 +216,21 @@
-gboolean +gboolean cd_it8_get_normalized ()
const gchar * +const gchar * cd_it8_get_originator ()
const gchar * +const gchar * cd_it8_get_title () @@ -302,21 +238,21 @@
-gboolean +gboolean cd_it8_get_spectral ()
const gchar * +const gchar * cd_it8_get_instrument ()
const gchar * +const gchar * cd_it8_get_reference () @@ -324,7 +260,7 @@
-gboolean +gboolean cd_it8_get_enable_created () @@ -332,7 +268,7 @@
-guint +guint cd_it8_get_data_size () @@ -340,7 +276,7 @@
-gboolean +gboolean cd_it8_get_data_item () @@ -348,7 +284,7 @@
-GPtrArray * +GPtrArray * cd_it8_get_spectrum_array () @@ -364,7 +300,7 @@
-gboolean +gboolean cd_it8_has_option () @@ -416,79 +352,14 @@

Functions

-

_cd_it8_reserved1 ()

-
void
-(*_cd_it8_reserved1) (void);
-

-

-
-
-
-

_cd_it8_reserved2 ()

-
void
-(*_cd_it8_reserved2) (void);
-

-

-
-
-
-

_cd_it8_reserved3 ()

-
void
-(*_cd_it8_reserved3) (void);
-

-

-
-
-
-

_cd_it8_reserved4 ()

-
void
-(*_cd_it8_reserved4) (void);
-

-

-
-
-
-

_cd_it8_reserved5 ()

-
void
-(*_cd_it8_reserved5) (void);
-

-

-
-
-
-

_cd_it8_reserved6 ()

-
void
-(*_cd_it8_reserved6) (void);
-

-

-
-
-
-

_cd_it8_reserved7 ()

-
void
-(*_cd_it8_reserved7) (void);
-

-

-
-
-
-

_cd_it8_reserved8 ()

-
void
-(*_cd_it8_reserved8) (void);
-

-

-
-
-

cd_it8_error_quark ()

-
GQuark
+
GQuark
 cd_it8_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.0

+
Since: 0.1.0
@@ -497,11 +368,10 @@ cd_it8_new (void);

Creates a new CdIt8 object.

-

Returns

+

Returns

a new CdIt8 object.

-

-

Since 0.1.20

+

Since: 0.1.20

@@ -510,7 +380,7 @@ cd_it8_new_with_kind (CdIt8Kind kind);

Creates a new CdIt8 object.

-

Parameters

+

Parameters

@@ -525,23 +395,22 @@
-

Returns

+

Returns

a new CdIt8 object.

-

-

Since 0.1.20

+

Since: 0.1.20

cd_it8_load_from_data ()

-
gboolean
+
gboolean
 cd_it8_load_from_data (CdIt8 *it8,
-                       const gchar *data,
-                       gsize size,
-                       GError **error);

+                       const gchar *data,
+                       gsize size,
+                       GError **error);

Loads a it8 file from data.

-

Parameters

+

Parameters

@@ -566,29 +435,28 @@ - +

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

TRUE if a valid it8 file was read.

-

+

Returns

+

TRUE if a valid it8 file was read.

-

Since 0.1.20

+

Since: 0.1.20

cd_it8_load_from_file ()

-
gboolean
+
gboolean
 cd_it8_load_from_file (CdIt8 *it8,
-                       GFile *file,
-                       GError **error);

+                       GFile *file,
+                       GError **error);

Loads a it8 file from disk.

-

Parameters

+

Parameters

@@ -603,34 +471,33 @@ - + - +

file

a GFile

a GFile

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

TRUE if a valid it8 file was read.

-

+

Returns

+

TRUE if a valid it8 file was read.

-

Since 0.1.20

+

Since: 0.1.20

cd_it8_save_to_file ()

-
gboolean
+
gboolean
 cd_it8_save_to_file (CdIt8 *it8,
-                     GFile *file,
-                     GError **error);

+                     GFile *file,
+                     GError **error);

Saves a it8 file to disk

-

Parameters

+

Parameters

@@ -645,35 +512,34 @@ - + - +

file

a GFile

a GFile

  

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

TRUE if it8 file was saved.

-

+

Returns

+

TRUE if it8 file was saved.

-

Since 0.1.20

+

Since: 0.1.20

cd_it8_save_to_data ()

-
gboolean
+
gboolean
 cd_it8_save_to_data (CdIt8 *it8,
-                     gchar **data,
-                     gsize *size,
-                     GError **error);

+                     gchar **data,
+                     gsize *size,
+                     GError **error);

Saves a it8 file to an area of memory.

-

Parameters

+

Parameters

@@ -699,18 +565,17 @@ - +

error

a GError, or NULL

a GError, or NULL

  
-

Returns

-

TRUE if it8 file was saved.

-

+

Returns

+

TRUE if it8 file was saved.

-

Since 0.1.26

+

Since: 0.1.26

@@ -720,7 +585,7 @@ CdIt8Kind kind);

Set the kind of IT8 file.

-

Parameters

+

Parameters

@@ -741,17 +606,17 @@
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_set_normalized ()

void
 cd_it8_set_normalized (CdIt8 *it8,
-                       gboolean normalized);
+ gboolean normalized);

Sets if normalized data should be written to the .it8 file.

-

Parameters

+

Parameters

@@ -772,17 +637,17 @@
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_set_originator ()

void
 cd_it8_set_originator (CdIt8 *it8,
-                       const gchar *originator);
+ const gchar *originator);

Sets the program name that created the .it8 file

-

Parameters

+

Parameters

@@ -803,17 +668,17 @@
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_set_title ()

void
 cd_it8_set_title (CdIt8 *it8,
-                  const gchar *title);
+ const gchar *title);

Sets the display name for the file.

-

Parameters

+

Parameters

@@ -834,17 +699,17 @@
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_set_spectral ()

void
 cd_it8_set_spectral (CdIt8 *it8,
-                     gboolean spectral);
+ gboolean spectral);

Sets if spectral data should be written to the .it8 file.

-

Parameters

+

Parameters

@@ -865,17 +730,17 @@
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_set_instrument ()

void
 cd_it8_set_instrument (CdIt8 *it8,
-                       const gchar *instrument);
+ const gchar *instrument);

Sets the measuring instrument that created the .it8 file

-

Parameters

+

Parameters

@@ -896,17 +761,17 @@
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_set_reference ()

void
 cd_it8_set_reference (CdIt8 *it8,
-                      const gchar *reference);
+ const gchar *reference);

Sets the reference that as used to create the .it8 reference

-

Parameters

+

Parameters

@@ -927,19 +792,19 @@
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_set_enable_created ()

void
 cd_it8_set_enable_created (CdIt8 *it8,
-                           gboolean enable_created);
+ gboolean enable_created);

Sets if the 'CREATED' attribute should be written. This is mainly useful in the self test programs where we want to string compare the output data with a known reference.

-

Parameters

+

Parameters

@@ -960,7 +825,7 @@
-

Since 0.1.33

+

Since: 0.1.33

@@ -974,7 +839,7 @@ is NULL then a black reading (0.0, 0.0, 0.0) is added instead.

-

Parameters

+

Parameters

@@ -989,28 +854,28 @@ - + - +

rgb

a CdColorRGB, or NULL

a CdColorRGB, or NULL

  

xyz

a CdColorXYZ, or NULL

a CdColorXYZ, or NULL

  
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_add_option ()

void
 cd_it8_add_option (CdIt8 *it8,
-                   const gchar *option);
+ const gchar *option);

Sets any extra options that have to be set in the CCMX file

-

Parameters

+

Parameters

@@ -1031,7 +896,7 @@
-

Since 0.1.20

+

Since: 0.1.20

@@ -1041,7 +906,7 @@ const CdMat3x3 *matrix);

Set the calibration matrix in the it8 file.

-

Parameters

+

Parameters

@@ -1062,17 +927,17 @@
-

Since 0.1.20

+

Since: 0.1.20

cd_it8_set_spectrum_array ()

void
 cd_it8_set_spectrum_array (CdIt8 *it8,
-                           GPtrArray *data);
+ GPtrArray *data);

Set the spectral data

-

Parameters

+

Parameters

@@ -1093,7 +958,7 @@
-

Since 1.1.6

+

Since: 1.1.6

@@ -1103,7 +968,7 @@ CdSpectrum *spectrum);

Adds a spectrum to the spectral array.

-

Parameters

+

Parameters

@@ -1124,7 +989,7 @@
-

Since 1.1.6

+

Since: 1.1.6

@@ -1133,7 +998,7 @@ cd_it8_get_matrix (CdIt8 *it8);

Gets the calibration matrix in the it8 file.

-

Parameters

+

Parameters

@@ -1148,11 +1013,10 @@
-

Returns

+

Returns

a CdMat3x3.

-

-

Since 0.1.20

+

Since: 0.1.20

@@ -1161,7 +1025,7 @@ cd_it8_get_kind (CdIt8 *it8);

Gets the kind of IT8 file.

-

Parameters

+

Parameters

@@ -1176,20 +1040,19 @@
-

Returns

+

Returns

a CdIt8Kind, e.g CD_IT8_KIND_TI3.

-

-

Since 0.1.20

+

Since: 0.1.20

cd_it8_get_normalized ()

-
gboolean
+
gboolean
 cd_it8_get_normalized (CdIt8 *it8);

 
Gets if the data should be written normlaised to y=100.

 

-
Parameters

+
Parameters

 
@@ -1204,20 +1067,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if the data should be normalised.

-

+
Returns

+
 TRUE if the data should be normalised.

 

-
Since 0.1.20

+
Since: 0.1.20

cd_it8_get_originator ()

-
const gchar *
+
const gchar *
 cd_it8_get_originator (CdIt8 *it8);

 
Gets the file orginator.

 

-
Parameters

+
Parameters

 
@@ -1232,20 +1094,19 @@
 

 
 


 

 

-
Returns

-
 The originator, or NULL if unset

-

+
Returns

+
 The originator, or NULL if unset

 

-
Since 0.1.20

+
Since: 0.1.20

cd_it8_get_title ()

-
const gchar *
+
const gchar *
 cd_it8_get_title (CdIt8 *it8);

 
Gets the file title.

 

-
Parameters

+
Parameters

 
@@ -1260,20 +1121,19 @@
 

 
 


 

 

-
Returns

-
 The title, or NULL if unset

-

+
Returns

+
 The title, or NULL if unset

 

-
Since 0.1.20

+
Since: 0.1.20

cd_it8_get_spectral ()

-
gboolean
+
gboolean
 cd_it8_get_spectral (CdIt8 *it8);

 
Gets if the data is spectral or XYZ.

 

-
Parameters

+
Parameters

 
@@ -1288,20 +1148,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if the data is in spectral bands.

-

+
Returns

+
 TRUE if the data is in spectral bands.

 

-
Since 0.1.20

+
Since: 0.1.20

cd_it8_get_instrument ()

-
const gchar *
+
const gchar *
 cd_it8_get_instrument (CdIt8 *it8);

 
Gets the instrument the file was created by.

 

-
Parameters

+
Parameters

 
@@ -1316,20 +1175,19 @@
 

 
 


 

 

-
Returns

-
 The instrument, or NULL if unset

-

+
Returns

+
 The instrument, or NULL if unset

 

-
Since 0.1.20

+
Since: 0.1.20

cd_it8_get_reference ()

-
const gchar *
+
const gchar *
 cd_it8_get_reference (CdIt8 *it8);

 
Gets the reference the file was created against.

 

-
Parameters

+
Parameters

 
@@ -1344,21 +1202,20 @@
 

 
 


 

 

-
Returns

-
 The reference, or NULL if unset

-

+
Returns

+
 The reference, or NULL if unset

 

-
Since 0.1.20

+
Since: 0.1.20

cd_it8_get_enable_created ()

-
gboolean
+
gboolean
 cd_it8_get_enable_created (CdIt8 *it8);

 
Gets if the 'CREATED' attribute will be written. This is typically only
 set in the self test programs.

 

-
Parameters

+
Parameters

 
@@ -1373,20 +1230,19 @@
 

 
 


 

 

-
Returns

-
 The reference, or NULL if unset

-

+
Returns

+
 The reference, or NULL if unset

 

-
Since 0.1.33

+
Since: 0.1.33

cd_it8_get_data_size ()

-
guint
+
guint
 cd_it8_get_data_size (CdIt8 *it8);

 
Gets the data size.

 

-
Parameters

+
Parameters

 
@@ -1401,24 +1257,23 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The number of RGB-XYZ readings in this object.

-

 

-
Since 0.1.20

+
Since: 0.1.20

cd_it8_get_data_item ()

-
gboolean
+
gboolean
 cd_it8_get_data_item (CdIt8 *it8,
-                      guint idx,
+                      guint idx,
                       CdColorRGB *rgb,
                       CdColorXYZ *xyz);

 
Gets a specific bit of data from this object.
 The returned data are absolute readings and are not normalised.

 

-
Parameters

+
Parameters

 
@@ -1450,20 +1305,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if the index existed.

-

+
Returns

+
 TRUE if the index existed.

 

-
Since 0.1.20

+
Since: 0.1.20

cd_it8_get_spectrum_array ()

-
GPtrArray *
+
GPtrArray *
 cd_it8_get_spectrum_array (CdIt8 *it8);

 
Gets the spectral data of IT8 file.

 

-
Parameters

+
Parameters

 
@@ -1478,21 +1332,21 @@
 

 
 


 

 

-
Returns

+
Returns

 
 spectral data. 

 
[transfer container][element-type CdSpectrum]

 

-
Since 1.1.6

+
Since: 1.1.6

cd_it8_get_spectrum_by_id ()

CdSpectrum *
 cd_it8_get_spectrum_by_id (CdIt8 *it8,
-                           const gchar *id);
+ const gchar *id);

Gets a specific spectrum in an IT8 file.

-

Parameters

+

Parameters

@@ -1514,21 +1368,21 @@
-

Returns

-

spectrum, or NULL.

+

Returns

+

spectrum, or NULL.

[transfer none]

-

Since 1.1.6

+

Since: 1.1.6

cd_it8_has_option ()

-
gboolean
+
gboolean
 cd_it8_has_option (CdIt8 *it8,
-                   const gchar *option);

+                   const gchar *option);

Finds an option in the file.

-

Parameters

+

Parameters

@@ -1550,24 +1404,23 @@
-

Returns

-

TRUE if the option is set

-

+

Returns

+

TRUE if the option is set

-

Since 0.1.20

+

Since: 0.1.20

cd_it8_get_xyz_for_rgb ()

CdColorXYZ *
 cd_it8_get_xyz_for_rgb (CdIt8 *it8,
-                        gdouble R,
-                        gdouble G,
-                        gdouble B,
-                        gdouble delta);
+ gdouble R, + gdouble G, + gdouble B, + gdouble delta);

Gets the XYZ value for a specific RGB value.

-

Parameters

+

Parameters

@@ -1604,11 +1457,11 @@
-

Returns

-

A CdColorXYZ, or NULL if the sample does not exist.

+

Returns

+

A CdColorXYZ, or NULL if the sample does not exist.

[transfer none]

-

Since 1.2.6

+

Since: 1.2.6

@@ -1633,7 +1486,7 @@

enum CdIt8Error

Errors that can be thrown

-

Members

+

Members

@@ -1667,7 +1520,7 @@

enum CdIt8Kind

The kind of IT8 file.

-

Members

+

Members

@@ -1722,6 +1575,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-it8-utils.html colord-1.3.2/doc/api/html/colord-cd-it8-utils.html --- colord-1.2.12/doc/api/html/colord-cd-it8-utils.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-it8-utils.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@
-gboolean +gboolean cd_it8_utils_calculate_ccmx () @@ -49,7 +49,7 @@
-gboolean +gboolean cd_it8_utils_calculate_xyz_from_cmf () @@ -57,7 +57,7 @@
-gboolean +gboolean cd_it8_utils_calculate_cri_from_cmf () @@ -65,7 +65,7 @@
-gboolean +gboolean cd_it8_utils_calculate_gamma () @@ -82,15 +82,15 @@

Functions

cd_it8_utils_calculate_ccmx ()

-
gboolean
+
gboolean
 cd_it8_utils_calculate_ccmx (CdIt8 *it8_reference,
                              CdIt8 *it8_measured,
                              CdIt8 *it8_ccmx,
-                             GError **error);

+                             GError **error);

This calculates the colorimeter correction matrix using the Four-Color Matrix Method by Yoshihiro Ohno and Jonathan E. Hardis, 1997.

-

Parameters

+

Parameters

@@ -115,31 +115,30 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

-

TRUE if a correction matrix was found.

-

+

Returns

+

TRUE if a correction matrix was found.

cd_it8_utils_calculate_xyz_from_cmf ()

-
gboolean
+
gboolean
 cd_it8_utils_calculate_xyz_from_cmf (CdIt8 *cmf,
                                      CdSpectrum *illuminant,
                                      CdSpectrum *spectrum,
                                      CdColorXYZ *value,
-                                     gdouble resolution,
-                                     GError **error);

+                                     gdouble resolution,
+                                     GError **error);

This calculates the XYZ from a CMF, illuminant and input spectrum.

-

Parameters

+

Parameters

@@ -174,31 +173,30 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

-

TRUE if a XYZ value was set.

-

+

Returns

+

TRUE if a XYZ value was set.

cd_it8_utils_calculate_cri_from_cmf ()

-
gboolean
+
gboolean
 cd_it8_utils_calculate_cri_from_cmf (CdIt8 *cmf,
                                      CdIt8 *tcs,
                                      CdSpectrum *illuminant,
-                                     gdouble *value,
-                                     gdouble resolution,
-                                     GError **error);

+                                     gdouble *value,
+                                     gdouble resolution,
+                                     GError **error);

This calculates the CRI for a specific illuminant.

-

Parameters

+

Parameters

@@ -233,28 +231,27 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

-

TRUE if a XYZ value was set.

-

+

Returns

+

TRUE if a XYZ value was set.

cd_it8_utils_calculate_gamma ()

-
gboolean
+
gboolean
 cd_it8_utils_calculate_gamma (CdIt8 *it8,
-                              gdouble *gamma_y,
-                              GError **error);

+                              gdouble *gamma_y,
+                              GError **error);

This estimates the gamma from values obtained from an .ti3 file.

-

Parameters

+

Parameters

@@ -274,18 +271,17 @@ - +

error

A GError, or NULL

A GError, or NULL

  
-

Returns

-

TRUE if a valid value was found.

-

+

Returns

+

TRUE if a valid value was found.

-

Since 0.2.6

+

Since: 0.2.6

@@ -293,6 +289,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-math.html colord-1.3.2/doc/api/html/colord-cd-math.html --- colord-1.2.12/doc/api/html/colord-cd-math.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-math.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -81,7 +81,7 @@
-gdouble +gdouble cd_vec3_squared_error () @@ -89,7 +89,7 @@
-gchar * +gchar * cd_vec3_to_string () @@ -97,7 +97,7 @@
-gdouble * +gdouble * cd_vec3_get_data () @@ -129,7 +129,7 @@
-gchar * +gchar * cd_mat33_to_string () @@ -137,7 +137,7 @@
-gdouble * +gdouble * cd_mat33_get_data () @@ -177,7 +177,7 @@
-gboolean +gboolean cd_mat33_reciprocal () @@ -185,7 +185,7 @@
-gdouble +gdouble cd_mat33_determinant () @@ -241,7 +241,7 @@ cd_vec3_clear (CdVec3 *src);

Clears a vector, setting all it's values to zero.

-

Parameters

+

Parameters

@@ -268,7 +268,7 @@ and dest can be the same value.

-

Parameters

+

Parameters

@@ -307,7 +307,7 @@ and dest can be the same value.

-

Parameters

+

Parameters

@@ -339,14 +339,14 @@

cd_vec3_scalar_multiply ()

void
 cd_vec3_scalar_multiply (const CdVec3 *src,
-                         gdouble value,
+                         gdouble value,
                          CdVec3 *dest);

Multiplies a vector with a scalar. The arguments src and dest can be the same value.

-

Parameters

+

Parameters

@@ -384,7 +384,7 @@ and dest cannot be the same value.

-

Parameters

+

Parameters

@@ -409,12 +409,12 @@

cd_vec3_squared_error ()

-
gdouble
+
gdouble
 cd_vec3_squared_error (const CdVec3 *src1,
                        const CdVec3 *src2);

 
Gets the mean squared error for a pair of vectors

 

-
Parameters

+
Parameters
@@ -436,19 +436,18 @@
-

Returns

+

Returns

the floating point MSE.

-

cd_vec3_to_string ()

-
gchar *
+
gchar *
 cd_vec3_to_string (const CdVec3 *src);

 
Obtains a string representaton of a vector.

 

-
Parameters

+
Parameters

 
@@ -463,19 +462,18 @@
 

 
 


 

 

-
Returns

-
 the string. Free with g_free()

-

+
Returns

+
 the string. Free with g_free()

cd_vec3_get_data ()

-
gdouble *
+
gdouble *
 cd_vec3_get_data (const CdVec3 *src);

 
Gets the raw data for the vector.

 

-
Parameters

+
Parameters

 
@@ -490,9 +488,8 @@
 

 
 


 

 

-
Returns

+
Returns

 
 the pointer to the data segment.

-
@@ -500,12 +497,12 @@

cd_vec3_init ()

void
 cd_vec3_init (CdVec3 *dest,
-              gdouble v0,
-              gdouble v1,
-              gdouble v2);
+ gdouble v0, + gdouble v1, + gdouble v2);

Initialises a vector.

-

Parameters

+

Parameters

@@ -542,18 +539,18 @@

cd_mat33_init ()

void
 cd_mat33_init (CdMat3x3 *dest,
-               gdouble m00,
-               gdouble m01,
-               gdouble m02,
-               gdouble m10,
-               gdouble m11,
-               gdouble m12,
-               gdouble m20,
-               gdouble m21,
-               gdouble m22);
+ gdouble m00, + gdouble m01, + gdouble m02, + gdouble m10, + gdouble m11, + gdouble m12, + gdouble m20, + gdouble m21, + gdouble m22);

Initialises a matrix.

-

Parameters

+

Parameters

@@ -622,7 +619,7 @@ cd_mat33_clear (const CdMat3x3 *src);

Clears a matrix value, setting all it's values to zero.

-

Parameters

+

Parameters

@@ -640,11 +637,11 @@

cd_mat33_to_string ()

-
gchar *
+
gchar *
 cd_mat33_to_string (const CdMat3x3 *src);

 
Obtains a string representaton of a matrix.

 

-
Parameters

+
Parameters
@@ -659,19 +656,18 @@
-

Returns

-

the string. Free with g_free()

-

+

Returns

+

the string. Free with g_free()

cd_mat33_get_data ()

-
gdouble *
+
gdouble *
 cd_mat33_get_data (const CdMat3x3 *src);

 
Gets the raw data for the matrix.

 

-
Parameters

+
Parameters

 
@@ -686,9 +682,8 @@
 

 
 


 

 

-
Returns

+
Returns

 
 the pointer to the data segment.

-
@@ -698,7 +693,7 @@ cd_mat33_set_identity (CdMat3x3 *src);

Sets the matrix to an identity value.

-

Parameters

+

Parameters

@@ -718,14 +713,14 @@

cd_mat33_scalar_multiply ()

void
 cd_mat33_scalar_multiply (const CdMat3x3 *mat_src,
-                          gdouble value,
+                          gdouble value,
                           CdMat3x3 *mat_dest);

Multiplies a matrix with a scalar. The arguments vec_src and vec_dest can be the same value.

-

Parameters

+

Parameters

@@ -764,7 +759,7 @@ and vec_dest cannot be the same value.

-

Parameters

+

Parameters

@@ -806,7 +801,7 @@ cannot be the same as mat_dest .

-

Parameters

+

Parameters

@@ -836,7 +831,7 @@

cd_mat33_reciprocal ()

-
gboolean
+
gboolean
 cd_mat33_reciprocal (const CdMat3x3 *src,
                      CdMat3x3 *dest);

 
Inverts the matrix.
@@ -844,7 +839,7 @@
  and dest
  cannot be the same value.

 

-
Parameters

+
Parameters
@@ -866,19 +861,18 @@
-

Returns

-

FALSE if det is zero (singular).

-

+

Returns

+

FALSE if det is zero (singular).

cd_mat33_determinant ()

-
gdouble
+
gdouble
 cd_mat33_determinant (const CdMat3x3 *src);

 
Gets the determinant of the matrix.

 

-
Parameters

+
Parameters

 
@@ -892,10 +886,6 @@
 

 
 

 

 

-

-
Returns

-

-
@@ -908,7 +898,7 @@ and dest can be the same value.

-

Parameters

+

Parameters

@@ -941,7 +931,7 @@ and dest cannot be the same value.

-

Parameters

+

Parameters

@@ -992,6 +982,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-profile.html colord-1.3.2/doc/api/html/colord-cd-profile.html --- colord-1.2.12/doc/api/html/colord-cd-profile.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-profile.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,79 +41,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void - -(*changed) () -
-void - -(*_cd_profile_reserved1) () -
-void - -(*_cd_profile_reserved2) () -
-void - -(*_cd_profile_reserved3) () -
-void - -(*_cd_profile_reserved4) () -
-void - -(*_cd_profile_reserved5) () -
-void - -(*_cd_profile_reserved6) () -
-void - -(*_cd_profile_reserved7) () -
-void - -(*_cd_profile_reserved8) () -
-GQuark +GQuark cd_profile_error_quark () @@ -145,7 +73,7 @@
-gboolean +gboolean cd_profile_connect_finish () @@ -161,7 +89,7 @@
-gboolean +gboolean cd_profile_set_property_finish () @@ -177,49 +105,49 @@
-gboolean +gboolean cd_profile_install_system_wide_finish ()
const gchar * +const gchar * cd_profile_get_id ()
const gchar * +const gchar * cd_profile_get_filename ()
const gchar * +const gchar * cd_profile_get_qualifier ()
const gchar * +const gchar * cd_profile_get_format ()
const gchar * +const gchar * cd_profile_get_title ()
const gchar * +const gchar * cd_profile_get_object_path () @@ -251,7 +179,7 @@
-guint +guint cd_profile_get_owner () @@ -259,7 +187,7 @@
-gchar ** +gchar ** cd_profile_get_warnings () @@ -267,7 +195,7 @@
-gint64 +gint64 cd_profile_get_created () @@ -275,7 +203,7 @@
-gint64 +gint64 cd_profile_get_age () @@ -283,7 +211,7 @@
-gboolean +gboolean cd_profile_get_has_vcgt () @@ -291,7 +219,7 @@
-gboolean +gboolean cd_profile_get_is_system_wide () @@ -299,14 +227,14 @@
-GHashTable * +GHashTable * cd_profile_get_metadata ()
const gchar * +const gchar * cd_profile_get_metadata_item () @@ -322,7 +250,7 @@
-gboolean +gboolean cd_profile_get_connected () @@ -330,7 +258,7 @@
-gchar * +gchar * cd_profile_to_string () @@ -338,7 +266,7 @@
-gboolean +gboolean cd_profile_equal () @@ -346,7 +274,7 @@
-gboolean +gboolean cd_profile_has_access () @@ -391,87 +319,14 @@

Functions

-

changed ()

-
void
-(*changed) (CdDevice *device);
-

-

-
-
-
-

_cd_profile_reserved1 ()

-
void
-(*_cd_profile_reserved1) (void);
-

-

-
-
-
-

_cd_profile_reserved2 ()

-
void
-(*_cd_profile_reserved2) (void);
-

-

-
-
-
-

_cd_profile_reserved3 ()

-
void
-(*_cd_profile_reserved3) (void);
-

-

-
-
-
-

_cd_profile_reserved4 ()

-
void
-(*_cd_profile_reserved4) (void);
-

-

-
-
-
-

_cd_profile_reserved5 ()

-
void
-(*_cd_profile_reserved5) (void);
-

-

-
-
-
-

_cd_profile_reserved6 ()

-
void
-(*_cd_profile_reserved6) (void);
-

-

-
-
-
-

_cd_profile_reserved7 ()

-
void
-(*_cd_profile_reserved7) (void);
-

-

-
-
-
-

_cd_profile_reserved8 ()

-
void
-(*_cd_profile_reserved8) (void);
-

-

-
-
-

cd_profile_error_quark ()

-
GQuark
+
GQuark
 cd_profile_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.0

+
Since: 0.1.0
@@ -480,20 +335,19 @@ cd_profile_new (void);

Creates a new CdProfile object.

-

Returns

+

Returns

a new CdProfile object.

-

-

Since 0.1.0

+

Since: 0.1.0

cd_profile_new_with_object_path ()

CdProfile *
-cd_profile_new_with_object_path (const gchar *object_path);
+cd_profile_new_with_object_path (const gchar *object_path);

Creates a new CdProfile object with a known object path.

-

Parameters

+

Parameters

@@ -508,23 +362,22 @@
-

Returns

+

Returns

a new profile object.

-

-

Since 0.1.8

+

Since: 0.1.8

cd_profile_connect ()

void
 cd_profile_connect (CdProfile *profile,
-                    GCancellable *cancellable,
-                    GAsyncReadyCallback callback,
-                    gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Connects to the object and fills up initial properties.

-

Parameters

+

Parameters

@@ -539,7 +392,7 @@ - + @@ -556,18 +409,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_profile_connect_finish ()

-
gboolean
+
gboolean
 cd_profile_connect_finish (CdProfile *profile,
-                           GAsyncResult *res,
-                           GError **error);

+                           GAsyncResult *res,
+                           GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -582,37 +435,36 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_profile_set_property ()

void
 cd_profile_set_property (CdProfile *profile,
-                         const gchar *key,
-                         const gchar *value,
-                         GCancellable *cancellable,
-                         GAsyncReadyCallback callback,
-                         gpointer user_data);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Deletes a color device.

-

Parameters

+

Parameters

@@ -637,7 +489,7 @@ - + @@ -654,18 +506,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_profile_set_property_finish ()

-
gboolean
+
gboolean
 cd_profile_set_property_finish (CdProfile *profile,
-                                GAsyncResult *res,
-                                GError **error);

+                                GAsyncResult *res,
+                                GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -680,35 +532,34 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_profile_install_system_wide ()

void
 cd_profile_install_system_wide (CdProfile *profile,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Sets the profile system wide.

-

Parameters

+

Parameters

@@ -723,7 +574,7 @@ - + @@ -740,18 +591,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_profile_install_system_wide_finish ()

-
gboolean
+
gboolean
 cd_profile_install_system_wide_finish (CdProfile *profile,
-                                       GAsyncResult *res,
-                                       GError **error);

+                                       GAsyncResult *res,
+                                       GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -766,32 +617,31 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_profile_get_id ()

-
const gchar *
+
const gchar *
 cd_profile_get_id (CdProfile *profile);

 
Gets the profile ID.

 

-
Parameters

+
Parameters

 
@@ -806,20 +656,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.0

+
Since: 0.1.0

cd_profile_get_filename ()

-
const gchar *
+
const gchar *
 cd_profile_get_filename (CdProfile *profile);

 
Gets the profile filename.

 

-
Parameters

+
Parameters

 
@@ -834,20 +683,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.0

+
Since: 0.1.0

cd_profile_get_qualifier ()

-
const gchar *
+
const gchar *
 cd_profile_get_qualifier (CdProfile *profile);

 
Gets the profile qualifier.

 

-
Parameters

+
Parameters

 
@@ -862,20 +710,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.0

+
Since: 0.1.0

cd_profile_get_format ()

-
const gchar *
+
const gchar *
 cd_profile_get_format (CdProfile *profile);

 
Gets the profile format.

 

-
Parameters

+
Parameters

 
@@ -890,20 +737,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.4

+
Since: 0.1.4

cd_profile_get_title ()

-
const gchar *
+
const gchar *
 cd_profile_get_title (CdProfile *profile);

 
Gets the profile title.

 

-
Parameters

+
Parameters

 
@@ -918,20 +764,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.0

+
Since: 0.1.0

cd_profile_get_object_path ()

-
const gchar *
+
const gchar *
 cd_profile_get_object_path (CdProfile *profile);

 
Gets the object path for the profile.

 

-
Parameters

+
Parameters

 
@@ -946,11 +791,10 @@
 

 
 


 

 

-
Returns

-
 the object path, or NULL

-

+
Returns

+
 the object path, or NULL

 

-
Since 0.1.0

+
Since: 0.1.0
@@ -959,7 +803,7 @@ cd_profile_get_kind (CdProfile *profile);

Gets the profile kind.

-

Parameters

+

Parameters

@@ -974,11 +818,10 @@
-

Returns

+

Returns

A CdProfileKind, e.g. CD_PROFILE_KIND_DISPLAY_DEVICE

-

-

Since 0.1.1

+

Since: 0.1.1

@@ -987,7 +830,7 @@ cd_profile_get_colorspace (CdProfile *profile);

Gets the profile colorspace.

-

Parameters

+

Parameters

@@ -1002,11 +845,10 @@
-

Returns

+

Returns

A CdColorspace, e.g. CD_COLORSPACE_RGB

-

-

Since 0.1.2

+

Since: 0.1.2

@@ -1015,7 +857,7 @@ cd_profile_get_scope (CdProfile *profile);

Gets the profile scope.

-

Parameters

+

Parameters

@@ -1030,20 +872,19 @@
-

Returns

+

Returns

A CdObjectScope, e.g. CD_OBJECT_SCOPE_UNKNOWN

-

-

Since 0.1.10

+

Since: 0.1.10

cd_profile_get_owner ()

-
guint
+
guint
 cd_profile_get_owner (CdProfile *profile);

 
Gets the profile owner.

 

-
Parameters

+
Parameters

 
@@ -1058,20 +899,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The UID of the user that created the device

-

 

-
Since 0.1.13

+
Since: 0.1.13

cd_profile_get_warnings ()

-
gchar **
+
gchar **
 cd_profile_get_warnings (CdProfile *profile);

 
Gets the profile warnings as a string array.

 

-
Parameters

+
Parameters

 
@@ -1086,20 +926,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 Any profile warnings, e.g. "vcgt-non-monotonic". 

 
[transfer none]

 

-
Since 0.1.25

+
Since: 0.1.25

cd_profile_get_created ()

-
gint64
+
gint64
 cd_profile_get_created (CdProfile *profile);

 
Gets the profile created date and time.

 

-
Parameters

+
Parameters

 
@@ -1114,20 +954,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 A UNIX time, or 0 if the profile has no creation date

-

 

-
Since 0.1.8

+
Since: 0.1.8

cd_profile_get_age ()

-
gint64
+
gint64
 cd_profile_get_age (CdProfile *profile);

 
Gets the profile age in seconds relative to the current time.

 

-
Parameters

+
Parameters

 
@@ -1142,20 +981,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 A UNIX time, or 0 if the profile has no creation date

-

 

-
Since 0.1.8

+
Since: 0.1.8

cd_profile_get_has_vcgt ()

-
gboolean
+
gboolean
 cd_profile_get_has_vcgt (CdProfile *profile);

 
Returns if the profile has a VCGT table.

 

-
Parameters

+
Parameters

 
@@ -1170,21 +1008,20 @@
 

 
 


 

 

-
Returns

-
 TRUE if VCGT is valid.

-

+
Returns

+
 TRUE if VCGT is valid.

 

-
Since 0.1.2

+
Since: 0.1.2

cd_profile_get_is_system_wide ()

-
gboolean
+
gboolean
 cd_profile_get_is_system_wide (CdProfile *profile);

 
Returns if the profile is installed system wide and available for all
 users.

 

-
Parameters

+
Parameters

 
@@ -1199,20 +1036,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if system wide.

-

+
Returns

+
 TRUE if system wide.

 

-
Since 0.1.2

+
Since: 0.1.2

cd_profile_get_metadata ()

-
GHashTable *
+
GHashTable *
 cd_profile_get_metadata (CdProfile *profile);

 
Returns the profile metadata.

 

-
Parameters

+
Parameters

 
@@ -1227,22 +1063,22 @@
 

 
 


 

 

-
Returns

+
Returns

 
 a
-GHashTable. 

+GHashTable. 

 
[transfer container][element-type utf8 utf8]

 

-
Since 0.1.2

+
Since: 0.1.2

cd_profile_get_metadata_item ()

-
const gchar *
+
const gchar *
 cd_profile_get_metadata_item (CdProfile *profile,
-                              const gchar *key);

+                              const gchar *key);

Returns the profile metadata for a specific key.

-

Parameters

+

Parameters

@@ -1264,21 +1100,20 @@
-

Returns

-

the metadata value, or NULL if not set.

-

+

Returns

+

the metadata value, or NULL if not set.

-

Since 0.1.5

+

Since: 0.1.5

cd_profile_set_object_path ()

void
 cd_profile_set_object_path (CdProfile *profile,
-                            const gchar *object_path);
+ const gchar *object_path);

Sets the object path of the profile.

-

Parameters

+

Parameters

@@ -1299,16 +1134,16 @@
-

Since 0.1.8

+

Since: 0.1.8

cd_profile_get_connected ()

-
gboolean
+
gboolean
 cd_profile_get_connected (CdProfile *profile);

 
Gets if the profile has been connected.

 

-
Parameters

+
Parameters

 
@@ -1323,20 +1158,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if properties are valid

-

+
Returns

+
 TRUE if properties are valid

 

-
Since 0.1.9

+
Since: 0.1.9

cd_profile_to_string ()

-
gchar *
+
gchar *
 cd_profile_to_string (CdProfile *profile);

 
Converts the profile to a string description.

 

-
Parameters

+
Parameters

 
@@ -1351,21 +1185,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 text representation of CdProfile

-

 

-
Since 0.1.0

+
Since: 0.1.0

cd_profile_equal ()

-
gboolean
+
gboolean
 cd_profile_equal (CdProfile *profile1,
                   CdProfile *profile2);

 
Tests two profiles for equality.

 

-
Parameters

+
Parameters

 
@@ -1387,20 +1220,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if the profiles are the same device

-

+
Returns

+
 TRUE if the profiles are the same device

 

-
Since 0.1.8

+
Since: 0.1.8

cd_profile_has_access ()

-
gboolean
+
gboolean
 cd_profile_has_access (CdProfile *profile);

 
Gets if the current user has access permissions to the profile.

 

-
Parameters

+
Parameters

 
@@ -1415,11 +1247,10 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.13

+
Since: 0.1.13
@@ -1427,11 +1258,11 @@ 
CdIcc *
 cd_profile_load_icc (CdProfile *profile,
                      CdIccLoadFlags flags,
-                     GCancellable *cancellable,
-                     GError **error);
+ GCancellable *cancellable, + GError **error);

Loads a local ICC object from the abstract profile.

-

Parameters

+

Parameters

@@ -1451,23 +1282,23 @@ - + - +

cancellable

A GCancellable, or NULL

A GCancellable, or NULL

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

A new CdIcc object, or NULL for error.

+

Returns

+

A new CdIcc object, or NULL for error.

[transfer full]

-

Since 0.1.32

+

Since: 0.1.32

@@ -1490,6 +1321,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-profile-sync.html colord-1.3.2/doc/api/html/colord-cd-profile-sync.html --- colord-1.2.12/doc/api/html/colord-cd-profile-sync.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-profile-sync.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@
-gboolean +gboolean cd_profile_connect_sync () @@ -49,7 +49,7 @@
-gboolean +gboolean cd_profile_set_property_sync () @@ -57,7 +57,7 @@
-gboolean +gboolean cd_profile_install_system_wide_sync () @@ -76,15 +76,15 @@

Functions

cd_profile_connect_sync ()

-
gboolean
+
gboolean
 cd_profile_connect_sync (CdProfile *profile,
-                         GCancellable *cancellable,
-                         GError **error);

+                         GCancellable *cancellable,
+                         GError **error);

Connects to the object and fills up initial properties.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -99,38 +99,37 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.8

+

Since: 0.1.8

cd_profile_set_property_sync ()

-
gboolean
+
gboolean
 cd_profile_set_property_sync (CdProfile *profile,
-                              const gchar *key,
-                              const gchar *value,
-                              GCancellable *cancellable,
-                              GError **error);

+                              const gchar *key,
+                              const gchar *value,
+                              GCancellable *cancellable,
+                              GError **error);

Sets properties on an object

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -155,36 +154,35 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.8

+

Since: 0.1.8

cd_profile_install_system_wide_sync ()

-
gboolean
+
gboolean
 cd_profile_install_system_wide_sync (CdProfile *profile,
-                                     GCancellable *cancellable,
-                                     GError **error);

+                                     GCancellable *cancellable,
+                                     GError **error);

Sets the profile system wide.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -199,23 +197,22 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.8

+

Since: 0.1.8

@@ -223,6 +220,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-sensor.html colord-1.3.2/doc/api/html/colord-cd-sensor.html --- colord-1.2.12/doc/api/html/colord-cd-sensor.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-sensor.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,79 +41,7 @@
-void - -(*button_pressed) () -
-void - -(*_cd_sensor_reserved1) () -
-void - -(*_cd_sensor_reserved2) () -
-void - -(*_cd_sensor_reserved3) () -
-void - -(*_cd_sensor_reserved4) () -
-void - -(*_cd_sensor_reserved5) () -
-void - -(*_cd_sensor_reserved6) () -
-void - -(*_cd_sensor_reserved7) () -
-void - -(*_cd_sensor_reserved8) () -
-GQuark +GQuark cd_sensor_error_quark () @@ -145,7 +73,7 @@
-gboolean +gboolean cd_sensor_connect_finish () @@ -161,7 +89,7 @@
-gboolean +gboolean cd_sensor_lock_finish () @@ -177,7 +105,7 @@
-gboolean +gboolean cd_sensor_unlock_finish () @@ -193,7 +121,7 @@
-gboolean +gboolean cd_sensor_set_options_finish () @@ -216,14 +144,14 @@
const gchar * +const gchar * cd_sensor_get_object_path ()
const gchar * +const gchar * cd_sensor_get_id () @@ -231,7 +159,7 @@
-gboolean +gboolean cd_sensor_get_connected () @@ -262,21 +190,21 @@
const gchar * +const gchar * cd_sensor_get_serial ()
const gchar * +const gchar * cd_sensor_get_model ()
const gchar * +const gchar * cd_sensor_get_vendor () @@ -284,7 +212,7 @@
-gboolean +gboolean cd_sensor_get_native () @@ -292,7 +220,7 @@
-gboolean +gboolean cd_sensor_get_embedded () @@ -300,7 +228,7 @@
-gboolean +gboolean cd_sensor_get_locked () @@ -308,7 +236,7 @@
-guint64 +guint64 cd_sensor_get_caps () @@ -316,7 +244,7 @@
-gboolean +gboolean cd_sensor_has_cap () @@ -324,14 +252,14 @@
-GHashTable * +GHashTable * cd_sensor_get_options ()
const gchar * +const gchar * cd_sensor_get_option () @@ -339,14 +267,14 @@
-GHashTable * +GHashTable * cd_sensor_get_metadata ()
const gchar * +const gchar * cd_sensor_get_metadata_item () @@ -362,7 +290,7 @@
-gboolean +gboolean cd_sensor_equal () @@ -370,7 +298,7 @@
-gchar * +gchar * cd_sensor_to_string () @@ -407,87 +335,14 @@

Functions

-

button_pressed ()

-
void
-(*button_pressed) (CdSensor *sensor);
-

-

-
-
-
-

_cd_sensor_reserved1 ()

-
void
-(*_cd_sensor_reserved1) (void);
-

-

-
-
-
-

_cd_sensor_reserved2 ()

-
void
-(*_cd_sensor_reserved2) (void);
-

-

-
-
-
-

_cd_sensor_reserved3 ()

-
void
-(*_cd_sensor_reserved3) (void);
-

-

-
-
-
-

_cd_sensor_reserved4 ()

-
void
-(*_cd_sensor_reserved4) (void);
-

-

-
-
-
-

_cd_sensor_reserved5 ()

-
void
-(*_cd_sensor_reserved5) (void);
-

-

-
-
-
-

_cd_sensor_reserved6 ()

-
void
-(*_cd_sensor_reserved6) (void);
-

-

-
-
-
-

_cd_sensor_reserved7 ()

-
void
-(*_cd_sensor_reserved7) (void);
-

-

-
-
-
-

_cd_sensor_reserved8 ()

-
void
-(*_cd_sensor_reserved8) (void);
-

-

-
-
-

cd_sensor_error_quark ()

-
GQuark
+
GQuark
 cd_sensor_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.6

+
Since: 0.1.6
@@ -496,20 +351,19 @@ cd_sensor_new (void);

Creates a new CdSensor object.

-

Returns

+

Returns

a new CdSensor object.

-

-

Since 0.1.6

+

Since: 0.1.6

cd_sensor_new_with_object_path ()

CdSensor *
-cd_sensor_new_with_object_path (const gchar *object_path);
+cd_sensor_new_with_object_path (const gchar *object_path);

Creates a new CdSensor object with a known object path.

-

Parameters

+

Parameters

@@ -524,23 +378,22 @@
-

Returns

+

Returns

a new sensor object.

-

-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_connect ()

void
 cd_sensor_connect (CdSensor *sensor,
-                   GCancellable *cancellable,
-                   GAsyncReadyCallback callback,
-                   gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Connects to the sensor.

-

Parameters

+

Parameters

@@ -555,7 +408,7 @@ - + @@ -572,18 +425,18 @@

cancellable

a GCancellable or NULL

a GCancellable or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_connect_finish ()

-
gboolean
+
gboolean
 cd_sensor_connect_finish (CdSensor *sensor,
-                          GAsyncResult *res,
-                          GError **error);

+                          GAsyncResult *res,
+                          GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -598,35 +451,34 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

TRUE if we could connect to to the sensor

-

+

Returns

+

TRUE if we could connect to to the sensor

-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_lock ()

void
 cd_sensor_lock (CdSensor *sensor,
-                GCancellable *cancellable,
-                GAsyncReadyCallback callback,
-                gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Locks the device so we can use it.

-

Parameters

+

Parameters

@@ -641,7 +493,7 @@ - + @@ -658,18 +510,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_lock_finish ()

-
gboolean
+
gboolean
 cd_sensor_lock_finish (CdSensor *sensor,
-                       GAsyncResult *res,
-                       GError **error);

+                       GAsyncResult *res,
+                       GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -684,35 +536,34 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_unlock ()

void
 cd_sensor_unlock (CdSensor *sensor,
-                  GCancellable *cancellable,
-                  GAsyncReadyCallback callback,
-                  gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Unlocks the sensor for use by other programs.

-

Parameters

+

Parameters

@@ -727,7 +578,7 @@ - + @@ -744,18 +595,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_unlock_finish ()

-
gboolean
+
gboolean
 cd_sensor_unlock_finish (CdSensor *sensor,
-                         GAsyncResult *res,
-                         GError **error);

+                         GAsyncResult *res,
+                         GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -770,36 +621,35 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_set_options ()

void
 cd_sensor_set_options (CdSensor *sensor,
-                       GHashTable *values,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ GHashTable *values, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Sets options on the sensor device.

-

Parameters

+

Parameters

@@ -819,7 +669,7 @@ - + @@ -836,18 +686,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.20

+

Since: 0.1.20

cd_sensor_set_options_finish ()

-
gboolean
+
gboolean
 cd_sensor_set_options_finish (CdSensor *sensor,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -862,23 +712,22 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

+

Returns

success

-

-

Since 0.1.20

+

Since: 0.1.20

@@ -886,12 +735,12 @@ 
void
 cd_sensor_get_sample (CdSensor *sensor,
                       CdSensorCap cap,
-                      GCancellable *cancellable,
-                      GAsyncReadyCallback callback,
-                      gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets a color sample from a sensor

-

Parameters

+

Parameters

@@ -911,7 +760,7 @@ - + @@ -928,18 +777,18 @@

cancellable

a GCancellable, or NULL

a GCancellable, or NULL

  
-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_get_sample_finish ()

CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor,
-                             GAsyncResult *res,
-                             GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

-

Parameters

+

Parameters

@@ -954,32 +803,31 @@ - + - +

res

the GAsyncResult

the GAsyncResult

  

error

A GError or NULL

A GError or NULL

  
-

Returns

-

the XYZ reading, or NULL

-

+

Returns

+

the XYZ reading, or NULL

-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_get_object_path ()

-
const gchar *
+
const gchar *
 cd_sensor_get_object_path (CdSensor *sensor);

 
Gets the object path for the sensor.

 

-
Parameters

+
Parameters

 
@@ -994,20 +842,19 @@
 

 
 


 

 

-
Returns

-
 the object path, or NULL

-

+
Returns

+
 the object path, or NULL

 

-
Since 0.1.6

+
Since: 0.1.6

cd_sensor_get_id ()

-
const gchar *
+
const gchar *
 cd_sensor_get_id (CdSensor *sensor);

 
Gets the object ID for the sensor.

 

-
Parameters

+
Parameters

 
@@ -1022,20 +869,19 @@
 

 
 


 

 

-
Returns

-
 the object ID, or NULL

-

+
Returns

+
 the object ID, or NULL

 

-
Since 0.1.26

+
Since: 0.1.26

cd_sensor_get_connected ()

-
gboolean
+
gboolean
 cd_sensor_get_connected (CdSensor *sensor);

 
Gets if the sensor has been connected.

 

-
Parameters

+
Parameters

 
@@ -1050,11 +896,10 @@
 

 
 


 

 

-
Returns

-
 TRUE if properties are valid

-

+
Returns

+
 TRUE if properties are valid

 

-
Since 0.1.9

+
Since: 0.1.9
@@ -1063,7 +908,7 @@ cd_sensor_get_kind (CdSensor *sensor);

Gets the sensor kind.

-

Parameters

+

Parameters

@@ -1078,11 +923,10 @@
-

Returns

+

Returns

A CdSensorKind, e.g. CD_SENSOR_KIND_HUEY

-

-

Since 0.1.6

+

Since: 0.1.6

@@ -1091,7 +935,7 @@ cd_sensor_get_state (CdSensor *sensor);

Gets the sensor state.

-

Parameters

+

Parameters

@@ -1106,11 +950,10 @@
-

Returns

+

Returns

A CdSensorState, e.g. CD_SENSOR_STATE_IDLE

-

-

Since 0.1.6

+

Since: 0.1.6

@@ -1119,7 +962,7 @@ cd_sensor_get_mode (CdSensor *sensor);

Gets the sensor operating mode.

-

Parameters

+

Parameters

@@ -1134,20 +977,19 @@
-

Returns

+

Returns

A CdSensorCap, e.g. CD_SENSOR_CAP_AMBIENT

-

-

Since 0.1.6

+

Since: 0.1.6

cd_sensor_get_serial ()

-
const gchar *
+
const gchar *
 cd_sensor_get_serial (CdSensor *sensor);

 
Gets the sensor serial number.

 

-
Parameters

+
Parameters

 
@@ -1162,20 +1004,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.6

+
Since: 0.1.6

cd_sensor_get_model ()

-
const gchar *
+
const gchar *
 cd_sensor_get_model (CdSensor *sensor);

 
Gets the sensor model.

 

-
Parameters

+
Parameters

 
@@ -1190,20 +1031,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.6

+
Since: 0.1.6

cd_sensor_get_vendor ()

-
const gchar *
+
const gchar *
 cd_sensor_get_vendor (CdSensor *sensor);

 
Gets the sensor vendor.

 

-
Parameters

+
Parameters

 
@@ -1218,20 +1058,19 @@
 

 
 


 

 

-
Returns

-
 A string, or NULL for invalid

-

+
Returns

+
 A string, or NULL for invalid

 

-
Since 0.1.6

+
Since: 0.1.6

cd_sensor_get_native ()

-
gboolean
+
gboolean
 cd_sensor_get_native (CdSensor *sensor);

 
Returns if the sensor has a native driver.

 

-
Parameters

+
Parameters

 
@@ -1246,20 +1085,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if VCGT is valid.

-

+
Returns

+
 TRUE if VCGT is valid.

 

-
Since 0.1.6

+
Since: 0.1.6

cd_sensor_get_embedded ()

-
gboolean
+
gboolean
 cd_sensor_get_embedded (CdSensor *sensor);

 
Returns if the sensor is embedded into the computer.

 

-
Parameters

+
Parameters

 
@@ -1274,20 +1112,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if embedded.

-

+
Returns

+
 TRUE if embedded.

 

-
Since 0.1.26

+
Since: 0.1.26

cd_sensor_get_locked ()

-
gboolean
+
gboolean
 cd_sensor_get_locked (CdSensor *sensor);

 
Returns if the sensor is locked.

 

-
Parameters

+
Parameters

 
@@ -1302,20 +1139,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if VCGT is valid.

-

+
Returns

+
 TRUE if VCGT is valid.

 

-
Since 0.1.6

+
Since: 0.1.6

cd_sensor_get_caps ()

-
guint64
+
guint64
 cd_sensor_get_caps (CdSensor *sensor);

 
Returns the sensor metadata.

 

-
Parameters

+
Parameters

 
@@ -1330,21 +1166,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 The sensor capability bitfield.

-

 

-
Since 0.1.6

+
Since: 0.1.6

cd_sensor_has_cap ()

-
gboolean
+
gboolean
 cd_sensor_has_cap (CdSensor *sensor,
                    CdSensorCap cap);

 
Returns the sensor metadata for a specific key.

 

-
Parameters

+
Parameters

 
@@ -1366,20 +1201,19 @@
 

 
 


 

 

-
Returns

-
 TRUE if the sensor has the specified capability

-

+
Returns

+
 TRUE if the sensor has the specified capability

 

-
Since 0.1.6

+
Since: 0.1.6

cd_sensor_get_options ()

-
GHashTable *
+
GHashTable *
 cd_sensor_get_options (CdSensor *sensor);

 
Gets any sensor options.

 

-
Parameters

+
Parameters

 
@@ -1394,22 +1228,22 @@
 

 
 


 

 

-
Returns

+
Returns

 
 A
-refcounted GHashTable of (string, GVariant). 

+refcounted GHashTable of (string, GVariant). 

 
[transfer container][element-type utf8 GVariant]

 

-
Since 0.1.20

+
Since: 0.1.20

cd_sensor_get_option ()

-
const gchar *
+
const gchar *
 cd_sensor_get_option (CdSensor *sensor,
-                      const gchar *key);

+                      const gchar *key);

Gets a specific sensor option.

-

Parameters

+

Parameters

@@ -1431,20 +1265,19 @@
-

Returns

-

A const string, or NULL of not found.

-

+

Returns

+

A const string, or NULL of not found.

-

Since 0.1.20

+

Since: 0.1.20

cd_sensor_get_metadata ()

-
GHashTable *
+
GHashTable *
 cd_sensor_get_metadata (CdSensor *sensor);

 
Returns the sensor metadata.

 

-
Parameters

+
Parameters

 
@@ -1459,22 +1292,22 @@
 

 
 


 

 

-
Returns

+
Returns

 
 a
-GHashTable. 

+GHashTable. 

 
[transfer container][element-type utf8 utf8]

 

-
Since 0.1.28

+
Since: 0.1.28

cd_sensor_get_metadata_item ()

-
const gchar *
+
const gchar *
 cd_sensor_get_metadata_item (CdSensor *sensor,
-                             const gchar *key);

+                             const gchar *key);

Returns the sensor metadata for a specific key.

-

Parameters

+

Parameters

@@ -1496,21 +1329,20 @@
-

Returns

-

the metadata value, or NULL if not set.

-

+

Returns

+

the metadata value, or NULL if not set.

-

Since 0.1.28

+

Since: 0.1.28

cd_sensor_set_object_path ()

void
 cd_sensor_set_object_path (CdSensor *sensor,
-                           const gchar *object_path);
+ const gchar *object_path);

Sets the object path of the sensor.

-

Parameters

+

Parameters

@@ -1531,17 +1363,17 @@
-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_equal ()

-
gboolean
+
gboolean
 cd_sensor_equal (CdSensor *sensor1,
                  CdSensor *sensor2);

 
Tests two sensors for equality.

 

-
Parameters

+
Parameters

 
@@ -1563,23 +1395,18 @@
 

 
 


 

 

-
Returns

-
 TRUE if the sensors are the same device

-

+
Returns

+
 TRUE if the sensors are the same device

 

-
Since 0.1.8

+
Since: 0.1.8

cd_sensor_to_string ()

-
gchar *
+
gchar *
 cd_sensor_to_string (CdSensor *sensor);

 

 

-

-
Returns

-

-
@@ -1602,6 +1429,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-sensor-sync.html colord-1.3.2/doc/api/html/colord-cd-sensor-sync.html --- colord-1.2.12/doc/api/html/colord-cd-sensor-sync.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-sensor-sync.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@
-gboolean +gboolean cd_sensor_connect_sync () @@ -49,7 +49,7 @@
-gboolean +gboolean cd_sensor_lock_sync () @@ -57,7 +57,7 @@
-gboolean +gboolean cd_sensor_unlock_sync () @@ -65,7 +65,7 @@
-gboolean +gboolean cd_sensor_set_options_sync () @@ -92,15 +92,15 @@

Functions

cd_sensor_connect_sync ()

-
gboolean
+
gboolean
 cd_sensor_connect_sync (CdSensor *sensor,
-                        GCancellable *cancellable,
-                        GError **error);

+                        GCancellable *cancellable,
+                        GError **error);

Connects to the object and fills up initial properties.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -115,36 +115,35 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.8

+

Since: 0.1.8

cd_sensor_lock_sync ()

-
gboolean
+
gboolean
 cd_sensor_lock_sync (CdSensor *sensor,
-                     GCancellable *cancellable,
-                     GError **error);

+                     GCancellable *cancellable,
+                     GError **error);

Locks the device so we can use it.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -159,36 +158,35 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.6

+

Since: 0.1.6

cd_sensor_unlock_sync ()

-
gboolean
+
gboolean
 cd_sensor_unlock_sync (CdSensor *sensor,
-                       GCancellable *cancellable,
-                       GError **error);

+                       GCancellable *cancellable,
+                       GError **error);

Unlocks the device for use by other programs.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -203,37 +201,36 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.6

+

Since: 0.1.6

cd_sensor_set_options_sync ()

-
gboolean
+
gboolean
 cd_sensor_set_options_sync (CdSensor *sensor,
-                            GHashTable *values,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GHashTable *values,
+                            GCancellable *cancellable,
+                            GError **error);

Sets options on the sensor device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -253,23 +250,22 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

TRUE for success, else FALSE.

-

+

Returns

+

TRUE for success, else FALSE.

-

Since 0.1.20

+

Since: 0.1.20

@@ -277,13 +273,13 @@ 
CdColorXYZ *
 cd_sensor_get_sample_sync (CdSensor *sensor,
                            CdSensorCap cap,
-                           GCancellable *cancellable,
-                           GError **error);
+ GCancellable *cancellable, + GError **error);

Gets a sample from the sensor.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

-

Parameters

+

Parameters

@@ -303,23 +299,22 @@ - + - +

cancellable

a GCancellable or NULL

a GCancellable or NULL

  

error

a GError, or NULL.

a GError, or NULL.

  
-

Returns

-

the XYZ reading, with ambient levels in Lux encoded in X, or NULL for error.

-

+

Returns

+

the XYZ reading, with ambient levels in Lux encoded in X, or NULL for error.

-

Since 0.1.8

+

Since: 0.1.8

@@ -327,6 +322,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-spectrum.html colord-1.3.2/doc/api/html/colord-cd-spectrum.html --- colord-1.2.12/doc/api/html/colord-cd-spectrum.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-spectrum.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -97,7 +97,7 @@
const gchar * +const gchar * cd_spectrum_get_id () @@ -105,7 +105,7 @@
-GArray * +GArray * cd_spectrum_get_data () @@ -113,7 +113,7 @@
-gdouble +gdouble cd_spectrum_get_start () @@ -121,7 +121,7 @@
-gdouble +gdouble cd_spectrum_get_end () @@ -129,7 +129,7 @@
-gdouble +gdouble cd_spectrum_get_norm () @@ -137,7 +137,7 @@
-gdouble +gdouble cd_spectrum_get_resolution () @@ -145,7 +145,7 @@
-guint +guint cd_spectrum_get_size () @@ -153,7 +153,7 @@
-gdouble +gdouble cd_spectrum_get_value () @@ -161,7 +161,7 @@
-gdouble +gdouble cd_spectrum_get_value_raw () @@ -169,7 +169,7 @@
-gdouble +gdouble cd_spectrum_get_wavelength () @@ -177,7 +177,7 @@
-gdouble +gdouble cd_spectrum_get_value_for_nm () @@ -268,20 +268,19 @@ cd_spectrum_new (void);

Allocates a spectrum.

-

Returns

+

Returns

A newly allocated CdSpectrum object

-

-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_sized_new ()

CdSpectrum *
-cd_spectrum_sized_new (guint reserved_size);
+cd_spectrum_sized_new (guint reserved_size);

Allocates a spectrum with a preallocated size.

-

Parameters

+

Parameters

@@ -296,20 +295,19 @@
-

Returns

+

Returns

A newly allocated CdSpectrum object

-

-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_planckian_new ()

CdSpectrum *
-cd_spectrum_planckian_new (gdouble temperature);
+cd_spectrum_planckian_new (gdouble temperature);

Allocates a Planckian spectrum at a specific temperature.

-

Parameters

+

Parameters

@@ -324,11 +322,10 @@
-

Returns

+

Returns

A newly allocated CdSpectrum object

-

-

Since 1.1.6

+

Since: 1.1.6

@@ -337,7 +334,7 @@ cd_spectrum_free (CdSpectrum *spectrum);

Deallocates a color spectrum.

-

Parameters

+

Parameters

@@ -351,7 +348,7 @@
-

Since 1.1.6

+

Since: 1.1.6

@@ -359,7 +356,7 @@ 
CdSpectrum *
 cd_spectrum_dup (const CdSpectrum *spectrum);
-

Parameters

+

Parameters

@@ -373,22 +370,18 @@
-
-

Returns

-

-
-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_normalize ()

void
 cd_spectrum_normalize (CdSpectrum *spectrum,
-                       gdouble wavelength,
-                       gdouble value);
+ gdouble wavelength, + gdouble value);

Normalizes a spectrum to a specific value at a specific wavelength.

-

Parameters

+

Parameters

@@ -414,17 +407,17 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_normalize_max ()

void
 cd_spectrum_normalize_max (CdSpectrum *spectrum,
-                           gdouble value);
+ gdouble value);

Normalizes a spectrum to a specific value at its maximum value.

-

Parameters

+

Parameters

@@ -445,16 +438,16 @@
-

Since 1.2.6

+

Since: 1.2.6

cd_spectrum_get_id ()

-
const gchar *
+
const gchar *
 cd_spectrum_get_id (const CdSpectrum *spectrum);

 
Gets the spectral data.

 

-
Parameters

+
Parameters

 
@@ -469,21 +462,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 the textual ID of the sample

-

 

-
Since 1.1.6

+
Since: 1.1.6

cd_spectrum_get_data ()

-
GArray *
+
GArray *
 cd_spectrum_get_data (const CdSpectrum *spectrum);

 
Gets the spectral data.
 NOTE: This is not normalized

 

-
Parameters

+
Parameters

 
@@ -498,20 +490,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 spectral data. 

 
[transfer none][element-type gdouble]

 

-
Since 1.1.6

+
Since: 1.1.6

cd_spectrum_get_start ()

-
gdouble
+
gdouble
 cd_spectrum_get_start (const CdSpectrum *spectrum);

 
Gets the start value of the spectral data.

 

-
Parameters

+
Parameters

 
@@ -526,20 +518,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 the value in nm

-

 

-
Since 1.1.6

+
Since: 1.1.6

cd_spectrum_get_end ()

-
gdouble
+
gdouble
 cd_spectrum_get_end (const CdSpectrum *spectrum);

 
Gets the end value of the spectral data.

 

-
Parameters

+
Parameters

 
@@ -554,21 +545,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 the value in nm

-

 

-
Since 1.1.6

+
Since: 1.1.6

cd_spectrum_get_norm ()

-
gdouble
+
gdouble
 cd_spectrum_get_norm (const CdSpectrum *spectrum);

 
Gets the normalization value of the spectral data.
 NOTE: This affects every value in the spectrum.

 

-
Parameters

+
Parameters

 
@@ -583,20 +573,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 the value

-

 

-
Since 1.1.6

+
Since: 1.1.6

cd_spectrum_get_resolution ()

-
gdouble
+
gdouble
 cd_spectrum_get_resolution (const CdSpectrum *spectrum);

 
Gets the divisor of the spectra, for instance a .

 

-
Parameters

+
Parameters

 
@@ -611,20 +600,19 @@
 

 
 


 

 

-
Returns

+
Returns

 
 the value

-

 

-
Since 1.2.6

+
Since: 1.2.6

cd_spectrum_get_size ()

-
guint
+
guint
 cd_spectrum_get_size (const CdSpectrum *spectrum);

 
Gets the size of the spectrum data.

 

-
Parameters

+
Parameters

 
@@ -639,21 +627,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 number of data items in this spectrum

-

 

-
Since 1.1.6

+
Since: 1.1.6

cd_spectrum_get_value ()

-
gdouble
+
gdouble
 cd_spectrum_get_value (const CdSpectrum *spectrum,
-                       guint idx);

+                       guint idx);

Gets the spectrum data at a specified index.

-

Parameters

+

Parameters

@@ -675,22 +662,21 @@
-

Returns

+

Returns

spectral data value, or -1 for invalid

-

-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_get_value_raw ()

-
gdouble
+
gdouble
 cd_spectrum_get_value_raw (const CdSpectrum *spectrum,
-                           guint idx);

+                           guint idx);

Gets the spectrum data at a specified index, without any normalization applied. Most people should use cd_spectrum_get_value() instead.

-

Parameters

+

Parameters

@@ -712,21 +698,20 @@
-

Returns

+

Returns

spectral data value, or -1 for invalid

-

-

Since 1.2.6

+

Since: 1.2.6

cd_spectrum_get_wavelength ()

-
gdouble
+
gdouble
 cd_spectrum_get_wavelength (const CdSpectrum *spectrum,
-                            guint idx);

+                            guint idx);

Gets the wavelenth that corresponds to the specified index.

-

Parameters

+

Parameters

@@ -748,21 +733,20 @@
-

Returns

+

Returns

wavelenth value in nm, or -1 for invalid

-

-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_get_value_for_nm ()

-
gdouble
+
gdouble
 cd_spectrum_get_value_for_nm (const CdSpectrum *spectrum,
-                              gdouble wavelength);

+                              gdouble wavelength);

Gets the value from the spectral data for a given wavelength.

-

Parameters

+

Parameters

@@ -784,21 +768,20 @@
-

Returns

+

Returns

the value for the wavelength

-

-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_set_id ()

void
 cd_spectrum_set_id (CdSpectrum *spectrum,
-                    const gchar *id);
+ const gchar *id);

Sets a spectrum id.

-

Parameters

+

Parameters

@@ -819,17 +802,17 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_set_data ()

void
 cd_spectrum_set_data (CdSpectrum *spectrum,
-                      GArray *value);
+ GArray *value);

Sets the spectrum data.

-

Parameters

+

Parameters

@@ -850,17 +833,17 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_set_start ()

void
 cd_spectrum_set_start (CdSpectrum *spectrum,
-                       gdouble start);
+ gdouble start);

Set the start value of the spectal data in nm.

-

Parameters

+

Parameters

@@ -881,17 +864,19 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_set_end ()

void
 cd_spectrum_set_end (CdSpectrum *spectrum,
-                     gdouble end);
+ gdouble end);

Set the end value of the spectal data in nm.

+

If there is already spectral data, the wavelength calibration will +also be set automatically.

-

Parameters

+

Parameters

@@ -912,18 +897,18 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_set_norm ()

void
 cd_spectrum_set_norm (CdSpectrum *spectrum,
-                      gdouble norm);
+ gdouble norm);

Set the normalization value of the spectrum. NOTE: This affects every value in the spectrum.

-

Parameters

+

Parameters

@@ -944,18 +929,18 @@
-

Since 1.1.6

+

Since: 1.1.6

cd_spectrum_set_value ()

void
 cd_spectrum_set_value (CdSpectrum *spectrum,
-                       guint idx,
-                       gdouble data);
+ guint idx, + gdouble data);

Overwrites the spectrum data at a specified index.

-

Parameters

+

Parameters

@@ -981,17 +966,17 @@
-

Since 1.2.6

+

Since: 1.2.6

cd_spectrum_add_value ()

void
 cd_spectrum_add_value (CdSpectrum *spectrum,
-                       gdouble data);
+ gdouble data);

Adds a value in nm to the spectrum.

-

Parameters

+

Parameters

@@ -1005,7 +990,7 @@
-

Since 1.1.6

+

Since: 1.1.6

@@ -1013,10 +998,10 @@ 
CdSpectrum *
 cd_spectrum_multiply (CdSpectrum *s1,
                       CdSpectrum *s2,
-                      gdouble resolution);
+ gdouble resolution);

Multiplies two spectra together.

-

Parameters

+

Parameters

@@ -1043,11 +1028,10 @@
-

Returns

+

Returns

a CdSpectrum instance

-

-

Since 1.1.6

+

Since: 1.1.6

@@ -1055,6 +1039,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-transform.html colord-1.3.2/doc/api/html/colord-cd-transform.html --- colord-1.2.12/doc/api/html/colord-cd-transform.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-transform.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,71 +41,7 @@
-void - -(*_cd_transform_reserved1) () -
-void - -(*_cd_transform_reserved2) () -
-void - -(*_cd_transform_reserved3) () -
-void - -(*_cd_transform_reserved4) () -
-void - -(*_cd_transform_reserved5) () -
-void - -(*_cd_transform_reserved6) () -
-void - -(*_cd_transform_reserved7) () -
-void - -(*_cd_transform_reserved8) () -
-GQuark +GQuark cd_transform_error_quark () @@ -225,7 +161,7 @@
-gboolean +gboolean cd_transform_get_bpc () @@ -241,7 +177,7 @@
-guint +guint cd_transform_get_max_threads () @@ -249,7 +185,7 @@
-gboolean +gboolean cd_transform_process () @@ -291,79 +227,14 @@

Functions

-

_cd_transform_reserved1 ()

-
void
-(*_cd_transform_reserved1) (void);
-

-

-
-
-
-

_cd_transform_reserved2 ()

-
void
-(*_cd_transform_reserved2) (void);
-

-

-
-
-
-

_cd_transform_reserved3 ()

-
void
-(*_cd_transform_reserved3) (void);
-

-

-
-
-
-

_cd_transform_reserved4 ()

-
void
-(*_cd_transform_reserved4) (void);
-

-

-
-
-
-

_cd_transform_reserved5 ()

-
void
-(*_cd_transform_reserved5) (void);
-

-

-
-
-
-

_cd_transform_reserved6 ()

-
void
-(*_cd_transform_reserved6) (void);
-

-

-
-
-
-

_cd_transform_reserved7 ()

-
void
-(*_cd_transform_reserved7) (void);
-

-

-
-
-
-

_cd_transform_reserved8 ()

-
void
-(*_cd_transform_reserved8) (void);
-

-

-
-
-

cd_transform_error_quark ()

-
GQuark
+
GQuark
 cd_transform_error_quark (void);

 

-
Returns

+
Returns

 
 An error quark.

-

 

-
Since 0.1.34

+
Since: 0.1.34
@@ -372,11 +243,10 @@ cd_transform_new (void);

Creates a new CdTransform object.

-

Returns

+

Returns

a new CdTransform object.

-

-

Since 0.1.34

+

Since: 0.1.34

@@ -386,7 +256,7 @@ CdIcc *icc);

Sets the input profile to use for the transform.

-

Parameters

+

Parameters

@@ -401,13 +271,13 @@ - +

icc

a CdIcc instance or NULL.

a CdIcc instance or NULL.

  
-

Since 1.0.0

+

Since: 1.0.0

@@ -417,7 +287,7 @@ CdPixelFormat pixel_format);

Sets the pixel format to use for the transform.

-

Parameters

+

Parameters

@@ -438,7 +308,7 @@
-

Since 1.0.0

+

Since: 1.0.0

@@ -447,7 +317,7 @@ cd_transform_get_input_icc (CdTransform *transform);

Gets the input profile to use for the transform.

-

Parameters

+

Parameters

@@ -462,11 +332,11 @@
-

Returns

+

Returns

The input profile.

[transfer none]

-

Since 1.0.0

+

Since: 1.0.0

@@ -475,7 +345,7 @@ cd_transform_get_input_pixel_format (CdTransform *transform);

Gets the pixel format to use for the transform.

-

Parameters

+

Parameters

@@ -490,11 +360,10 @@
-

Returns

+

Returns

the pixel format, e.g. CD_PIXEL_FORMAT_RGBA_8

-

-

Since 1.0.0

+

Since: 1.0.0

@@ -504,7 +373,7 @@ CdIcc *icc);

Sets the output profile to use for the transform.

-

Parameters

+

Parameters

@@ -519,13 +388,13 @@ - +

icc

a CdIcc instance or NULL.

a CdIcc instance or NULL.

  
-

Since 1.0.0

+

Since: 1.0.0

@@ -535,7 +404,7 @@ CdPixelFormat pixel_format);

Sets the pixel format to use for the transform.

-

Parameters

+

Parameters

@@ -556,7 +425,7 @@
-

Since 1.0.0

+

Since: 1.0.0

@@ -565,7 +434,7 @@ cd_transform_get_output_icc (CdTransform *transform);

Gets the input profile to use for the transform.

-

Parameters

+

Parameters

@@ -580,11 +449,11 @@
-

Returns

+

Returns

The output profile.

[transfer none]

-

Since 1.0.0

+

Since: 1.0.0

@@ -593,7 +462,7 @@ cd_transform_get_output_pixel_format (CdTransform *transform);

Gets the pixel format to use for the transform.

-

Parameters

+

Parameters

@@ -608,11 +477,10 @@
-

Returns

+

Returns

the pixel format, e.g. CD_PIXEL_FORMAT_RGBA_8

-

-

Since 1.0.0

+

Since: 1.0.0

@@ -623,7 +491,7 @@

Sets the abstract profile to use for the transform. This is typically only needed for soft-proofing.

-

Parameters

+

Parameters

@@ -638,13 +506,13 @@ - +

icc

a CdIcc instance or NULL.

a CdIcc instance or NULL.

  
-

Since 1.0.0

+

Since: 1.0.0

@@ -653,7 +521,7 @@ cd_transform_get_abstract_icc (CdTransform *transform);

Gets the abstract profile to use for the transform.

-

Parameters

+

Parameters

@@ -668,11 +536,11 @@
-

Returns

+

Returns

The abstract profile.

[transfer none]

-

Since 1.0.0

+

Since: 1.0.0

@@ -682,7 +550,7 @@ CdRenderingIntent rendering_intent);

Sets the rendering intent to use for the transform.

-

Parameters

+

Parameters

@@ -703,7 +571,7 @@
-

Since 1.0.0

+

Since: 1.0.0

@@ -712,7 +580,7 @@ cd_transform_get_rendering_intent (CdTransform *transform);

Gets the rendering intent to use for the transform.

-

Parameters

+

Parameters

@@ -727,21 +595,20 @@
-

Returns

+

Returns

The rendering intent, e.g. CD_RENDERING_INTENT_PERCEPTUAL

-

-

Since 1.0.0

+

Since: 1.0.0

cd_transform_set_bpc ()

void
 cd_transform_set_bpc (CdTransform *transform,
-                      gboolean bpc);
+ gboolean bpc);

Sets if black point compensation should be used for the transform.

-

Parameters

+

Parameters

@@ -762,16 +629,16 @@
-

Since 1.0.0

+

Since: 1.0.0

cd_transform_get_bpc ()

-
gboolean
+
gboolean
 cd_transform_get_bpc (CdTransform *transform);

 
Gets the rendering bpc to use for the transform.

 

-
Parameters

+
Parameters

 
@@ -786,21 +653,20 @@
 

 
 


 

 

-
Returns

+
Returns

 
 If black point compensation should be used for the transform.

-

 

-
Since 1.0.0

+
Since: 1.0.0

cd_transform_set_max_threads ()

void
 cd_transform_set_max_threads (CdTransform *transform,
-                              guint max_threads);
+ guint max_threads);

Sets the maximum number of threads to be used for the transform.

-

Parameters

+

Parameters

@@ -821,16 +687,16 @@
-

Since 1.1.1

+

Since: 1.1.1

cd_transform_get_max_threads ()

-
guint
+
guint
 cd_transform_get_max_threads (CdTransform *transform);

 
Gets the maximum number of threads to be used for the transform.

 

-
Parameters

+
Parameters

 
@@ -845,29 +711,28 @@
 

 
 


 

 

-
Returns

+
Returns

 
 number of threads

-

 

-
Since 1.1.1

+
Since: 1.1.1

cd_transform_process ()

-
gboolean
+
gboolean
 cd_transform_process (CdTransform *transform,
-                      gpointer data_in,
-                      gpointer data_out,
-                      guint width,
-                      guint height,
-                      guint rowstride,
-                      GCancellable *cancellable,
-                      GError **error);

+                      gpointer data_in,
+                      gpointer data_out,
+                      guint width,
+                      guint height,
+                      guint rowstride,
+                      GCancellable *cancellable,
+                      GError **error);

Processes a block of data through the transform. Once the transform has been setup it is cached and only re-created if any of the formats, input, output or abstract profiles are changed.

-

Parameters

+

Parameters

@@ -912,23 +777,22 @@ - + - +

cancellable

A GError, or NULL

A GError, or NULL

  

error

A GCancellable, or NULL

A GCancellable, or NULL

  
-

Returns

-

TRUE if the pixels were successfully transformed.

-

+

Returns

+

TRUE if the pixels were successfully transformed.

-

Since 0.1.34

+

Since: 0.1.34

@@ -953,7 +817,7 @@

enum CdTransformError

The transform error code.

-

Members

+

Members

@@ -983,11 +847,11 @@
-

Since 0.1.34

+

Since: 0.1.34

-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord-cd-version.html colord-1.3.2/doc/api/html/colord-cd-version.html --- colord-1.2.12/doc/api/html/colord-cd-version.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord-cd-version.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -95,20 +95,20 @@

CD_MINOR_VERSION

-
#define CD_MINOR_VERSION				(2)
+
#define CD_MINOR_VERSION				(3)
 

 
The compile-time minor version

CD_MICRO_VERSION

-
#define CD_MICRO_VERSION				(11)
+
#define CD_MICRO_VERSION				(2)
 

 
The compile-time micro version
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/colord.devhelp2 colord-1.3.2/doc/api/html/colord.devhelp2 --- colord-1.2.12/doc/api/html/colord.devhelp2 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/colord.devhelp2 2016-03-21 11:48:32.000000000 +0000 @@ -89,14 +89,6 @@ - - - - - - - - @@ -131,14 +123,6 @@ - - - - - - - - @@ -216,14 +200,6 @@ - - - - - - - - @@ -248,16 +224,6 @@ - - - - - - - - - - @@ -275,14 +241,6 @@ - - - - - - - - @@ -393,24 +351,6 @@ - - - - - - - - - - - - - - - - - - @@ -472,15 +412,6 @@ - - - - - - - - - @@ -534,15 +465,6 @@ - - - - - - - - - @@ -582,15 +504,6 @@ - - - - - - - - - diff -Nru colord-1.2.12/doc/api/html/ColorManager.html colord-1.3.2/doc/api/html/ColorManager.html --- colord-1.2.12/doc/api/html/ColorManager.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/ColorManager.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -1053,6 +1053,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/Device.html colord-1.3.2/doc/api/html/Device.html --- colord-1.2.12/doc/api/html/Device.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/Device.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -754,6 +754,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/index.html colord-1.3.2/doc/api/html/index.html --- colord-1.2.12/doc/api/html/index.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/index.html 2016-03-21 11:48:32.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -22,7 +22,7 @@             
          

-

Version 1.2.12 +

Version 1.3.2

Copyright © 2011 The colord authors

@@ -155,6 +155,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/index.sgml colord-1.3.2/doc/api/html/index.sgml --- colord-1.2.12/doc/api/html/index.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/index.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,871 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru colord-1.2.12/doc/api/html/ix01.html colord-1.3.2/doc/api/html/ix01.html --- colord-1.2.12/doc/api/html/ix01.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/ix01.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -24,155 +24,6 @@ Index
-

Symbols

-
-
_cd_client_reserved1, _cd_client_reserved1 () -
-
_cd_client_reserved2, _cd_client_reserved2 () -
-
_cd_client_reserved3, _cd_client_reserved3 () -
-
_cd_client_reserved4, _cd_client_reserved4 () -
-
_cd_client_reserved5, _cd_client_reserved5 () -
-
_cd_client_reserved6, _cd_client_reserved6 () -
-
_cd_client_reserved7, _cd_client_reserved7 () -
-
_cd_client_reserved8, _cd_client_reserved8 () -
-
_cd_device_reserved1, _cd_device_reserved1 () -
-
_cd_device_reserved2, _cd_device_reserved2 () -
-
_cd_device_reserved3, _cd_device_reserved3 () -
-
_cd_device_reserved4, _cd_device_reserved4 () -
-
_cd_device_reserved5, _cd_device_reserved5 () -
-
_cd_device_reserved6, _cd_device_reserved6 () -
-
_cd_device_reserved7, _cd_device_reserved7 () -
-
_cd_device_reserved8, _cd_device_reserved8 () -
-
_cd_dom_reserved1, _cd_dom_reserved1 () -
-
_cd_dom_reserved2, _cd_dom_reserved2 () -
-
_cd_dom_reserved3, _cd_dom_reserved3 () -
-
_cd_dom_reserved4, _cd_dom_reserved4 () -
-
_cd_dom_reserved5, _cd_dom_reserved5 () -
-
_cd_dom_reserved6, _cd_dom_reserved6 () -
-
_cd_dom_reserved7, _cd_dom_reserved7 () -
-
_cd_dom_reserved8, _cd_dom_reserved8 () -
-
_cd_icc_reserved1, _cd_icc_reserved1 () -
-
_cd_icc_reserved2, _cd_icc_reserved2 () -
-
_cd_icc_reserved3, _cd_icc_reserved3 () -
-
_cd_icc_reserved4, _cd_icc_reserved4 () -
-
_cd_icc_reserved5, _cd_icc_reserved5 () -
-
_cd_icc_reserved6, _cd_icc_reserved6 () -
-
_cd_icc_reserved7, _cd_icc_reserved7 () -
-
_cd_icc_reserved8, _cd_icc_reserved8 () -
-
_cd_interp_reserved1, _cd_interp_reserved1 () -
-
_cd_interp_reserved2, _cd_interp_reserved2 () -
-
_cd_interp_reserved3, _cd_interp_reserved3 () -
-
_cd_interp_reserved4, _cd_interp_reserved4 () -
-
_cd_interp_reserved5, _cd_interp_reserved5 () -
-
_cd_interp_reserved6, _cd_interp_reserved6 () -
-
_cd_interp_reserved7, _cd_interp_reserved7 () -
-
_cd_interp_reserved8, _cd_interp_reserved8 () -
-
_cd_it8_reserved1, _cd_it8_reserved1 () -
-
_cd_it8_reserved2, _cd_it8_reserved2 () -
-
_cd_it8_reserved3, _cd_it8_reserved3 () -
-
_cd_it8_reserved4, _cd_it8_reserved4 () -
-
_cd_it8_reserved5, _cd_it8_reserved5 () -
-
_cd_it8_reserved6, _cd_it8_reserved6 () -
-
_cd_it8_reserved7, _cd_it8_reserved7 () -
-
_cd_it8_reserved8, _cd_it8_reserved8 () -
-
_cd_profile_reserved1, _cd_profile_reserved1 () -
-
_cd_profile_reserved2, _cd_profile_reserved2 () -
-
_cd_profile_reserved3, _cd_profile_reserved3 () -
-
_cd_profile_reserved4, _cd_profile_reserved4 () -
-
_cd_profile_reserved5, _cd_profile_reserved5 () -
-
_cd_profile_reserved6, _cd_profile_reserved6 () -
-
_cd_profile_reserved7, _cd_profile_reserved7 () -
-
_cd_profile_reserved8, _cd_profile_reserved8 () -
-
_cd_sensor_reserved1, _cd_sensor_reserved1 () -
-
_cd_sensor_reserved2, _cd_sensor_reserved2 () -
-
_cd_sensor_reserved3, _cd_sensor_reserved3 () -
-
_cd_sensor_reserved4, _cd_sensor_reserved4 () -
-
_cd_sensor_reserved5, _cd_sensor_reserved5 () -
-
_cd_sensor_reserved6, _cd_sensor_reserved6 () -
-
_cd_sensor_reserved7, _cd_sensor_reserved7 () -
-
_cd_sensor_reserved8, _cd_sensor_reserved8 () -
-
_cd_transform_reserved1, _cd_transform_reserved1 () -
-
_cd_transform_reserved2, _cd_transform_reserved2 () -
-
_cd_transform_reserved3, _cd_transform_reserved3 () -
-
_cd_transform_reserved4, _cd_transform_reserved4 () -
-
_cd_transform_reserved5, _cd_transform_reserved5 () -
-
_cd_transform_reserved6, _cd_transform_reserved6 () -
-
_cd_transform_reserved7, _cd_transform_reserved7 () -
-
_cd_transform_reserved8, _cd_transform_reserved8 () -
-
-
-

A

AddProfile
@@ -186,8 +37,6 @@
ButtonPressed
Sensor, The ButtonPressed signal
-
button_pressed, button_pressed () -
@@ -1207,8 +1056,6 @@
Profile, The Changed signal
-
changed, changed (), changed (), changed () -
Colorspace
Device, The "Colorspace" property @@ -1258,12 +1105,6 @@
DeviceRemoved
ColorManager, The DeviceRemoved signal
-
device_added, device_added () -
-
device_changed, device_changed () -
-
device_removed, device_removed () -
@@ -1279,8 +1120,6 @@
Enabled
Device, The "Enabled" property
-
eval, eval () -
@@ -1343,6 +1182,9 @@
GetSensors
ColorManager, GetSensors ()
+
GetSpectrum
+
Sensor, GetSpectrum () +
GetStandardSpace
ColorManager, GetStandardSpace ()
@@ -1452,8 +1294,6 @@

P

-
prepare, prepare () -
ProfileAdded
ColorManager, The ProfileAdded signal
@@ -1469,12 +1309,6 @@
Profiles
Device, The "Profiles" property
-
profile_added, profile_added () -
-
profile_changed, profile_changed () -
-
profile_removed, profile_removed () -
ProfilingInhibit
Device, ProfilingInhibit ()
@@ -1524,12 +1358,6 @@
SensorRemoved
ColorManager, The SensorRemoved signal
-
sensor_added, sensor_added () -
-
sensor_changed, sensor_changed () -
-
sensor_removed, sensor_removed () -
Serial
Device, The "Serial" property @@ -1541,7 +1369,7 @@
Device, SetEnabled ()
SetOptions
-
Sensor, SetOptions () +
Sensor, SetOptions ()
SetProperty
@@ -1600,6 +1428,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/libcolord.html colord-1.3.2/doc/api/html/libcolord.html --- colord-1.2.12/doc/api/html/libcolord.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/libcolord.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -62,6 +62,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/libcolordprivate.html colord-1.3.2/doc/api/html/libcolordprivate.html --- colord-1.2.12/doc/api/html/libcolordprivate.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/libcolordprivate.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/license.html colord-1.3.2/doc/api/html/license.html --- colord-1.2.12/doc/api/html/license.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/license.html 2016-03-21 11:48:32.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -367,6 +367,6 @@

-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/Profile.html colord-1.3.2/doc/api/html/Profile.html --- colord-1.2.12/doc/api/html/Profile.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/Profile.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -416,6 +416,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/ref-dbus.html colord-1.3.2/doc/api/html/ref-dbus.html --- colord-1.2.12/doc/api/html/ref-dbus.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/ref-dbus.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -59,6 +59,9 @@

E

element-type

Generics and defining elements of containers and arrays.

+

S

+
skip
+

Exposed in C code, not necessarily available in other languages.

T

transfer container

Free data container after the code is done.

@@ -69,6 +72,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/html/Sensor.html colord-1.3.2/doc/api/html/Sensor.html --- colord-1.2.12/doc/api/html/Sensor.html 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/html/Sensor.html 2016-03-21 11:48:32.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -42,6 +42,10 @@ out'd'sample_x, out'd'sample_y, out'd'sample_z) +GetSpectrum(in's'capability, +out'd'start_nm, +out'd'end_nm, +out'ad'data) SetOptions(in'a{sv}'values) @@ -185,6 +189,60 @@

+GetSpectrum ()

+
GetSpectrum (in's'capability,
+out'd'start_nm,
+out'd'end_nm,
+out'ad'data)
+
+

+ Gets a color spectrum using the sensor. +

+
++++ + + + + + + + + + + + + + + + + + + +

capability:

 +

+ The capability we are using, e.g. crt, + ambient, lcd, + led or projector. +

+

start_nm:

 +

+ The start of the wavelength range in nm. +

+

end_nm:

 +

+ The end of the wavelength range in nm. +

+

data:

 +

+ The non-normalised data array. +

+
+
+
+

SetOptions ()

SetOptions (in'a{sv}'values)
@@ -470,6 +528,6 @@
-
Generated by GTK-Doc V1.24
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru colord-1.2.12/doc/api/Makefile.in colord-1.3.2/doc/api/Makefile.in --- colord-1.2.12/doc/api/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/doc/api/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -310,6 +310,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -414,6 +415,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -502,6 +504,7 @@ @ENABLE_GTK_DOC_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) @ENABLE_GTK_DOC_TRUE@SETUP_FILES = \ @ENABLE_GTK_DOC_TRUE@ $(content_files) \ +@ENABLE_GTK_DOC_TRUE@ $(expand_content_files) \ @ENABLE_GTK_DOC_TRUE@ $(DOC_MAIN_SGML_FILE) \ @ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-sections.txt \ @ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-overrides.txt @@ -513,9 +516,9 @@ # Version information for marking the documentation @ENABLE_GTK_DOC_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) \ @ENABLE_GTK_DOC_TRUE@ version.xml.in -@ENABLE_GTK_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +@ENABLE_GTK_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ @ENABLE_GTK_DOC_TRUE@ html-build.stamp pdf-build.stamp \ -@ENABLE_GTK_DOC_TRUE@ tmpl.stamp sgml.stamp html.stamp pdf.stamp +@ENABLE_GTK_DOC_TRUE@ sgml.stamp html.stamp pdf.stamp @ENABLE_GTK_DOC_TRUE@SCANOBJ_FILES = \ @ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE).args \ @@ -550,11 +553,6 @@ @ENABLE_GTK_DOC_TRUE@GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) @ENABLE_GTK_DOC_TRUE@GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; -#### templates #### -@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) -@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -@ENABLE_GTK_DOC_TRUE@GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; - #### xml #### @ENABLE_GTK_DOC_TRUE@GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) @ENABLE_GTK_DOC_TRUE@GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) @@ -811,11 +809,11 @@ @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +@ENABLE_GTK_DOC_FALSE@uninstall-local: @ENABLE_GTK_DOC_FALSE@clean-local: -@ENABLE_GTK_DOC_FALSE@maintainer-clean-local: @ENABLE_GTK_DOC_FALSE@install-data-local: -@ENABLE_GTK_DOC_FALSE@uninstall-local: @ENABLE_GTK_DOC_FALSE@distclean-local: +@ENABLE_GTK_DOC_FALSE@maintainer-clean-local: clean: clean-recursive clean-am: clean-generic clean-libtool clean-local mostlyclean-am @@ -920,18 +918,15 @@ @ENABLE_GTK_DOC_TRUE@setup-build.stamp: @ENABLE_GTK_DOC_TRUE@ -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_GTK_DOC_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ +@ENABLE_GTK_DOC_TRUE@ files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ @ENABLE_GTK_DOC_TRUE@ if test "x$$files" != "x" ; then \ @ENABLE_GTK_DOC_TRUE@ for file in $$files ; do \ -@ENABLE_GTK_DOC_TRUE@ destdir=`dirname $(abs_builddir)/$$file` ;\ +@ENABLE_GTK_DOC_TRUE@ destdir=`dirname $(abs_builddir)/$$file`; \ @ENABLE_GTK_DOC_TRUE@ test -d "$$destdir" || mkdir -p "$$destdir"; \ @ENABLE_GTK_DOC_TRUE@ test -f $(abs_srcdir)/$$file && \ @ENABLE_GTK_DOC_TRUE@ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ @ENABLE_GTK_DOC_TRUE@ done; \ @ENABLE_GTK_DOC_TRUE@ fi; \ -@ENABLE_GTK_DOC_TRUE@ test -d $(abs_srcdir)/tmpl && \ -@ENABLE_GTK_DOC_TRUE@ { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ -@ENABLE_GTK_DOC_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ @ENABLE_GTK_DOC_TRUE@ fi @ENABLE_GTK_DOC_TRUE@ $(AM_V_at)touch setup-build.stamp @@ -944,7 +939,7 @@ @ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ scanobj_options=""; \ @ENABLE_GTK_DOC_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \ @ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \ @ENABLE_GTK_DOC_TRUE@ scanobj_options="--verbose"; \ @ENABLE_GTK_DOC_TRUE@ fi; \ @@ -961,23 +956,8 @@ @ENABLE_GTK_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @ENABLE_GTK_DOC_TRUE@ @true -@ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -@ENABLE_GTK_DOC_TRUE@ $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_GTK_DOC_TRUE@ if test -w $(abs_srcdir) ; then \ -@ENABLE_GTK_DOC_TRUE@ cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ -@ENABLE_GTK_DOC_TRUE@ fi \ -@ENABLE_GTK_DOC_TRUE@ fi -@ENABLE_GTK_DOC_TRUE@ $(AM_V_at)touch tmpl-build.stamp - -@ENABLE_GTK_DOC_TRUE@tmpl.stamp: tmpl-build.stamp -@ENABLE_GTK_DOC_TRUE@ @true - -@ENABLE_GTK_DOC_TRUE@$(srcdir)/tmpl/*.sgml: -@ENABLE_GTK_DOC_TRUE@ @true - -@ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ +@ENABLE_GTK_DOC_TRUE@sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent +@ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_XML)_source_dir='' ; \ @ENABLE_GTK_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ @ENABLE_GTK_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @ENABLE_GTK_DOC_TRUE@ done ; \ @@ -987,17 +967,28 @@ @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @ENABLE_GTK_DOC_TRUE@ @true -@ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@ENABLE_GTK_DOC_TRUE@xml/gtkdocentities.ent: Makefile +@ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ +@ENABLE_GTK_DOC_TRUE@ echo ""; \ +@ENABLE_GTK_DOC_TRUE@ echo ""; \ +@ENABLE_GTK_DOC_TRUE@ echo ""; \ +@ENABLE_GTK_DOC_TRUE@ echo ""; \ +@ENABLE_GTK_DOC_TRUE@ echo ""; \ +@ENABLE_GTK_DOC_TRUE@ echo ""; \ +@ENABLE_GTK_DOC_TRUE@ echo ""; \ +@ENABLE_GTK_DOC_TRUE@ ) > $@ + +@ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) @ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ @ENABLE_GTK_DOC_TRUE@ mkhtml_options=""; \ @ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \ @ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \ @ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ @ENABLE_GTK_DOC_TRUE@ fi; \ @ENABLE_GTK_DOC_TRUE@ fi; \ @ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \ @ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ @ENABLE_GTK_DOC_TRUE@ fi; \ @ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -1013,11 +1004,11 @@ @ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ $(AM_V_at)touch html-build.stamp -@ENABLE_GTK_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@ENABLE_GTK_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) @ENABLE_GTK_DOC_TRUE@ $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ @ENABLE_GTK_DOC_TRUE@ mkpdf_options=""; \ @ENABLE_GTK_DOC_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \ +@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \ @ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \ @ENABLE_GTK_DOC_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \ @ENABLE_GTK_DOC_TRUE@ fi; \ @@ -1042,13 +1033,15 @@ @ENABLE_GTK_DOC_TRUE@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ @ENABLE_GTK_DOC_TRUE@ rm -f $(DOC_MODULE).types; \ @ENABLE_GTK_DOC_TRUE@ fi +@ENABLE_GTK_DOC_TRUE@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ +@ENABLE_GTK_DOC_TRUE@ rm -f $(DOC_MODULE)-sections.txt; \ +@ENABLE_GTK_DOC_TRUE@ fi @ENABLE_GTK_DOC_TRUE@distclean-local: @ENABLE_GTK_DOC_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @ENABLE_GTK_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_GTK_DOC_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ -@ENABLE_GTK_DOC_TRUE@ rm -rf tmpl; \ +@ENABLE_GTK_DOC_TRUE@ rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ @ENABLE_GTK_DOC_TRUE@ fi @ENABLE_GTK_DOC_TRUE@maintainer-clean-local: @@ -1095,9 +1088,7 @@ @ENABLE_GTK_DOC_TRUE@@HAVE_GTK_DOC_FALSE@ @false @ENABLE_GTK_DOC_TRUE@dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local -@ENABLE_GTK_DOC_TRUE@ @mkdir $(distdir)/tmpl @ENABLE_GTK_DOC_TRUE@ @mkdir $(distdir)/html -@ENABLE_GTK_DOC_TRUE@ @-cp ./tmpl/*.sgml $(distdir)/tmpl @ENABLE_GTK_DOC_TRUE@ @cp ./html/* $(distdir)/html @ENABLE_GTK_DOC_TRUE@ @-cp ./$(DOC_MODULE).pdf $(distdir)/ @ENABLE_GTK_DOC_TRUE@ @-cp ./$(DOC_MODULE).types $(distdir)/ diff -Nru colord-1.2.12/doc/api/tmpl/cd-buffer.sgml colord-1.3.2/doc/api/tmpl/cd-buffer.sgml --- colord-1.2.12/doc/api/tmpl/cd-buffer.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-buffer.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ - -cd-buffer - - - - - - - - - - - - - - - - - - - - - - - - - -@CD_BUFFER_KIND_REQUEST: -@CD_BUFFER_KIND_RESPONSE: -@CD_BUFFER_KIND_UNKNOWN: - - - - - - -@buffer_kind: -@data: -@length: - - - - - - - -@buffer: -@Returns: - - - - - - - -@buffer: -@Returns: - - - - - - - -@buffer: -@value: - - - - - - - -@buffer: -@value: - - - - - - - -@buffer: -@Returns: - - - - - - - -@buffer: -@Returns: - - - - - - - -@buffer: -@value: - - - - - - - -@buffer: -@value: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-cleanup.sgml colord-1.3.2/doc/api/tmpl/cd-cleanup.sgml --- colord-1.2.12/doc/api/tmpl/cd-cleanup.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-cleanup.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ - -cd-cleanup - - - - - - - - - - - - - - - - - - - - - - - - - -@Type: -@name: -@func: - - - - - - - -@Type: -@name: -@func: - - - - - - - -@Type: -@name: -@func: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-client.sgml colord-1.3.2/doc/api/tmpl/cd-client.sgml --- colord-1.2.12/doc/api/tmpl/cd-client.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-client.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,669 +0,0 @@ - -cd-client - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@client: -@device: - - - - - - - -@client: -@device: - - - - - - - -@client: -@device: - - - - - - - -@client: -@profile: - - - - - - - -@client: -@profile: - - - - - - - -@client: -@profile: - - - - - - - -@client: -@sensor: - - - - - - - -@client: -@sensor: - - - - - - - -@client: -@sensor: - - - - - - - -@device: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@client: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@id: -@scope: -@properties: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@id: -@scope: -@properties: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@icc: -@scope: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@file: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@device: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@profile: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@id: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@key: -@value: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@id: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@filename: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@standard_space: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@kind: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@key: -@value: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@id: -@cancellable: -@callback: -@user_data: - - - - - - - -@client: -@res: -@error: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-client-sync.sgml colord-1.3.2/doc/api/tmpl/cd-client-sync.sgml --- colord-1.2.12/doc/api/tmpl/cd-client-sync.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-client-sync.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,241 +0,0 @@ - -cd-client-sync - - - - - - - - - - - - - - - - - - - - - - - - - -@client: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@profile: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@device: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@id: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@filename: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@id: -@scope: -@properties: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@icc: -@scope: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@file: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@id: -@scope: -@properties: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@id: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@key: -@value: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@standard_space: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@kind: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@key: -@value: -@cancellable: -@error: -@Returns: - - - - - - - -@client: -@id: -@cancellable: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-color.sgml colord-1.3.2/doc/api/tmpl/cd-color.sgml --- colord-1.2.12/doc/api/tmpl/cd-color.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-color.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,483 +0,0 @@ - -cd-color - - - - - - - - - - - - - - - - - - - - - - - - - -@R: -@G: -@B: - - - - - - -@swatch: -@Returns: - - - - - - - -@swatch: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@src: - - - - - - - -@src: - - - - - - - -@src: - - - - - - - -@src: - - - - - - - -@src: - - - - - - - -@src: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@dest: -@X: -@Y: -@Z: - - - - - - - -@dest: -@R: -@G: -@B: - - - - - - - -@dest: -@L: -@a: -@b: - - - - - - - -@dest: -@Y: -@x: -@y: - - - - - - - -@dest: -@U: -@V: -@W: - - - - - - - -@dest: -@name: - - - - - - - -@dest: -@value: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@p1: -@p2: -@Returns: - - - - - - - -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@whitepoint: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@dest: -@temp: - - - - - - - -@p1: -@p2: -@Returns: - - - - - - - -@temp: -@result: -@Returns: - - - - - - - -@p1: -@p2: -@index: -@result: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@max: -@dest: - - - - - - - -@void: -@Returns: - - - - - - - -@array: -@Returns: - - - - - - - -@array: -@new_length: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-context-lcms.sgml colord-1.3.2/doc/api/tmpl/cd-context-lcms.sgml --- colord-1.2.12/doc/api/tmpl/cd-context-lcms.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-context-lcms.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ - -cd-context-lcms - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@ctx: - - - - - - - -@ctx: - - - - - - - -@ctx: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-device.sgml colord-1.3.2/doc/api/tmpl/cd-device.sgml --- colord-1.2.12/doc/api/tmpl/cd-device.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-device.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,591 +0,0 @@ - -cd-device - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@device: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@object_path: -@Returns: - - - - - - - -@device: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@key: -@value: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@relation: -@profile: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@profile: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@profile: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@enabled: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@qualifiers: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@profile: -@cancellable: -@callback: -@user_data: - - - - - - - -@device: -@res: -@error: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@key: -@Returns: - - - - - - - -@device: -@object_path: - - - - - - - -@device: -@Returns: - - - - - - - -@device: -@Returns: - - - - - - - -@device1: -@device2: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-device-sync.sgml colord-1.3.2/doc/api/tmpl/cd-device-sync.sgml --- colord-1.2.12/doc/api/tmpl/cd-device-sync.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-device-sync.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,213 +0,0 @@ - -cd-device-sync - - - - - - - - - - - - - - - - - - - - - - - - - -@device: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@key: -@value: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@relation: -@profile: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@profile: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@qualifiers: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@profile: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@profile: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@enabled: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@value: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@value: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@value: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@kind: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@colorspace: -@cancellable: -@error: -@Returns: - - - - - - - -@device: -@mode: -@cancellable: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-dom.sgml colord-1.3.2/doc/api/tmpl/cd-dom.sgml --- colord-1.2.12/doc/api/tmpl/cd-dom.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-dom.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ - -cd-dom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@dom: -@Returns: - - - - - - - -@dom: -@data: -@data_len: -@error: -@Returns: - - - - - - - -@dom: -@root: -@path: -@Returns: - - - - - - - -@node: -@Returns: - - - - - - - -@node: -@Returns: - - - - - - - -@node: -@Returns: - - - - - - - -@node: -@Returns: - - - - - - - -@node: -@key: -@Returns: - - - - - - - -@node: -@rgb: -@Returns: - - - - - - - -@node: -@yxy: -@Returns: - - - - - - - -@node: -@lab: -@Returns: - - - - - - - -@node: -@key: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-edid.sgml colord-1.3.2/doc/api/tmpl/cd-edid.sgml --- colord-1.2.12/doc/api/tmpl/cd-edid.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-edid.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,183 +0,0 @@ - -CdEdid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@edid: - - - - - - - -@edid: -@edid_data: -@error: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - - - - - - -@edid: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-enum.sgml colord-1.3.2/doc/api/tmpl/cd-enum.sgml --- colord-1.2.12/doc/api/tmpl/cd-enum.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-enum.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,1346 +0,0 @@ - -cd-enum - - - - - - - - - - - - - - - - - - - - - - - - - -@CD_DEVICE_KIND_UNKNOWN: -@CD_DEVICE_KIND_DISPLAY: -@CD_DEVICE_KIND_SCANNER: -@CD_DEVICE_KIND_PRINTER: -@CD_DEVICE_KIND_CAMERA: -@CD_DEVICE_KIND_WEBCAM: - - - - - - -@CD_PROFILE_KIND_UNKNOWN: -@CD_PROFILE_KIND_INPUT_DEVICE: -@CD_PROFILE_KIND_DISPLAY_DEVICE: -@CD_PROFILE_KIND_OUTPUT_DEVICE: -@CD_PROFILE_KIND_DEVICELINK: -@CD_PROFILE_KIND_COLORSPACE_CONVERSION: -@CD_PROFILE_KIND_ABSTRACT: -@CD_PROFILE_KIND_NAMED_COLOR: - - - - - - -@CD_OBJECT_SCOPE_UNKNOWN: -@CD_OBJECT_SCOPE_NORMAL: -@CD_OBJECT_SCOPE_TEMP: -@CD_OBJECT_SCOPE_DISK: - - - - - - -@CD_RENDERING_INTENT_UNKNOWN: -@CD_RENDERING_INTENT_PERCEPTUAL: -@CD_RENDERING_INTENT_RELATIVE_COLORIMETRIC: -@CD_RENDERING_INTENT_SATURATION: -@CD_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@CD_COLORSPACE_UNKNOWN: -@CD_COLORSPACE_XYZ: -@CD_COLORSPACE_LAB: -@CD_COLORSPACE_LUV: -@CD_COLORSPACE_YCBCR: -@CD_COLORSPACE_YXY: -@CD_COLORSPACE_RGB: -@CD_COLORSPACE_GRAY: -@CD_COLORSPACE_HSV: -@CD_COLORSPACE_CMYK: -@CD_COLORSPACE_CMY: - - - - - - -@CD_DEVICE_MODE_UNKNOWN: -@CD_DEVICE_MODE_PHYSICAL: -@CD_DEVICE_MODE_VIRTUAL: - - - - - - -@CD_DEVICE_RELATION_UNKNOWN: -@CD_DEVICE_RELATION_SOFT: -@CD_DEVICE_RELATION_HARD: - - - - - - -@CD_SENSOR_KIND_UNKNOWN: -@CD_SENSOR_KIND_DUMMY: -@CD_SENSOR_KIND_HUEY: -@CD_SENSOR_KIND_COLOR_MUNKI_PHOTO: -@CD_SENSOR_KIND_SPYDER: -@CD_SENSOR_KIND_DTP20: -@CD_SENSOR_KIND_DTP22: -@CD_SENSOR_KIND_DTP41: -@CD_SENSOR_KIND_DTP51: -@CD_SENSOR_KIND_DTP94: -@CD_SENSOR_KIND_SPECTRO_SCAN: -@CD_SENSOR_KIND_I1_PRO: -@CD_SENSOR_KIND_COLORIMTRE_HCFR: -@CD_SENSOR_KIND_I1_DISPLAY3: -@CD_SENSOR_KIND_COLORHUG: -@CD_SENSOR_KIND_SPYDER2: -@CD_SENSOR_KIND_SPYDER3: -@CD_SENSOR_KIND_COLORHUG_PLUS: -@CD_SENSOR_KIND_I1_DISPLAY1: -@CD_SENSOR_KIND_I1_DISPLAY2: -@CD_SENSOR_KIND_DTP92: -@CD_SENSOR_KIND_I1_MONITOR: -@CD_SENSOR_KIND_SPYDER4: -@CD_SENSOR_KIND_COLOR_MUNKI_SMILE: -@CD_SENSOR_KIND_COLORHUG2: -@CD_SENSOR_KIND_SPYDER5: - - - - - - - - - - - - - -@CD_SENSOR_CAP_UNKNOWN: -@CD_SENSOR_CAP_LCD: -@CD_SENSOR_CAP_CRT: -@CD_SENSOR_CAP_PRINTER: -@CD_SENSOR_CAP_SPOT: -@CD_SENSOR_CAP_PROJECTOR: -@CD_SENSOR_CAP_AMBIENT: -@CD_SENSOR_CAP_CALIBRATION: -@CD_SENSOR_CAP_LED: -@CD_SENSOR_CAP_PLASMA: -@CD_SENSOR_CAP_LCD_CCFL: -@CD_SENSOR_CAP_LCD_RGB_LED: -@CD_SENSOR_CAP_LCD_WHITE_LED: -@CD_SENSOR_CAP_WIDE_GAMUT_LCD_CCFL: -@CD_SENSOR_CAP_WIDE_GAMUT_LCD_RGB_LED: - - - - - - -@CD_SENSOR_STATE_UNKNOWN: -@CD_SENSOR_STATE_STARTING: -@CD_SENSOR_STATE_IDLE: -@CD_SENSOR_STATE_MEASURING: -@CD_SENSOR_STATE_BUSY: - - - - - - -@CD_STANDARD_SPACE_UNKNOWN: -@CD_STANDARD_SPACE_SRGB: -@CD_STANDARD_SPACE_ADOBE_RGB: -@CD_STANDARD_SPACE_PROPHOTO_RGB: - - - - - - -@CD_PROFILE_WARNING_NONE: -@CD_PROFILE_WARNING_DESCRIPTION_MISSING: -@CD_PROFILE_WARNING_COPYRIGHT_MISSING: -@CD_PROFILE_WARNING_VCGT_NON_MONOTONIC: -@CD_PROFILE_WARNING_SCUM_DOT: -@CD_PROFILE_WARNING_GRAY_AXIS_INVALID: -@CD_PROFILE_WARNING_GRAY_AXIS_NON_MONOTONIC: -@CD_PROFILE_WARNING_PRIMARIES_INVALID: -@CD_PROFILE_WARNING_PRIMARIES_NON_ADDITIVE: -@CD_PROFILE_WARNING_PRIMARIES_UNLIKELY: -@CD_PROFILE_WARNING_WHITEPOINT_INVALID: -@CD_PROFILE_WARNING_WHITEPOINT_UNLIKELY: - - - - - - -@CD_PROFILE_QUALITY_LOW: -@CD_PROFILE_QUALITY_MEDIUM: -@CD_PROFILE_QUALITY_HIGH: - - - - - - -@CD_SENSOR_ERROR_NO_SUPPORT: -@CD_SENSOR_ERROR_NO_DATA: -@CD_SENSOR_ERROR_INTERNAL: -@CD_SENSOR_ERROR_ALREADY_LOCKED: -@CD_SENSOR_ERROR_NOT_LOCKED: -@CD_SENSOR_ERROR_IN_USE: -@CD_SENSOR_ERROR_FAILED_TO_AUTHENTICATE: -@CD_SENSOR_ERROR_REQUIRED_POSITION_CALIBRATE: -@CD_SENSOR_ERROR_REQUIRED_POSITION_SURFACE: - - - - - - -@CD_PROFILE_ERROR_INTERNAL: -@CD_PROFILE_ERROR_ALREADY_INSTALLED: -@CD_PROFILE_ERROR_FAILED_TO_WRITE: -@CD_PROFILE_ERROR_FAILED_TO_PARSE: -@CD_PROFILE_ERROR_FAILED_TO_READ: -@CD_PROFILE_ERROR_FAILED_TO_AUTHENTICATE: -@CD_PROFILE_ERROR_PROPERTY_INVALID: -@CD_PROFILE_ERROR_FAILED_TO_GET_UID: - - - - - - -@CD_DEVICE_ERROR_INTERNAL: -@CD_DEVICE_ERROR_PROFILE_DOES_NOT_EXIST: -@CD_DEVICE_ERROR_PROFILE_ALREADY_ADDED: -@CD_DEVICE_ERROR_PROFILING: -@CD_DEVICE_ERROR_NOTHING_MATCHED: -@CD_DEVICE_ERROR_FAILED_TO_INHIBIT: -@CD_DEVICE_ERROR_FAILED_TO_UNINHIBIT: -@CD_DEVICE_ERROR_FAILED_TO_AUTHENTICATE: -@CD_DEVICE_ERROR_NOT_ENABLED: - - - - - - -@CD_CLIENT_ERROR_INTERNAL: -@CD_CLIENT_ERROR_ALREADY_EXISTS: -@CD_CLIENT_ERROR_FAILED_TO_AUTHENTICATE: -@CD_CLIENT_ERROR_NOT_SUPPORTED: -@CD_CLIENT_ERROR_NOT_FOUND: -@CD_CLIENT_ERROR_INPUT_INVALID: -@CD_CLIENT_ERROR_FILE_INVALID: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@bitfield: -@tmp: - - - - - - - -@bitfield: -@tmp: - - - - - - - -@bitfield: -@tmp: - - - - - - - -@tmp: - - - - - - - -@value: -@...: -@Returns: - - - - - - - -@kind_enum: -@Returns: - - - - - - - -@kind: -@Returns: - - - - - - - -@profile_kind: -@Returns: - - - - - - - -@profile_kind: -@Returns: - - - - - - - -@rendering_intent: -@Returns: - - - - - - - -@rendering_intent: -@Returns: - - - - - - - -@pixel_format: -@Returns: - - - - - - - -@pixel_format: -@Returns: - - - - - - - -@colorspace: -@Returns: - - - - - - - -@colorspace: -@Returns: - - - - - - - -@device_mode: -@Returns: - - - - - - - -@device_mode: -@Returns: - - - - - - - -@device_relation: -@Returns: - - - - - - - -@device_relation: -@Returns: - - - - - - - -@object_scope: -@Returns: - - - - - - - -@object_scope: -@Returns: - - - - - - - -@sensor_kind: -@Returns: - - - - - - - -@sensor_kind: -@Returns: - - - - - - - -@sensor_state: -@Returns: - - - - - - - -@sensor_state: -@Returns: - - - - - - - -@sensor_cap: -@Returns: - - - - - - - -@sensor_cap: -@Returns: - - - - - - - -@standard_space: -@Returns: - - - - - - - -@standard_space: -@Returns: - - - - - - - -@kind_enum: -@Returns: - - - - - - - -@type: -@Returns: - - - - - - - -@quality_enum: -@Returns: - - - - - - - -@quality: -@Returns: - - - - - - - -@device_kind: -@Returns: - - - - - - - -@error_enum: -@Returns: - - - - - - - -@error_desc: -@Returns: - - - - - - - -@error_enum: -@Returns: - - - - - - - -@error_desc: -@Returns: - - - - - - - -@error_enum: -@Returns: - - - - - - - -@error_desc: -@Returns: - - - - - - - -@error_enum: -@Returns: - - - - - - - -@error_desc: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-icc.sgml colord-1.3.2/doc/api/tmpl/cd-icc.sgml --- colord-1.2.12/doc/api/tmpl/cd-icc.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-icc.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,716 +0,0 @@ - -cd-icc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@CD_ICC_ERROR_FAILED_TO_OPEN: -@CD_ICC_ERROR_FAILED_TO_PARSE: -@CD_ICC_ERROR_INVALID_LOCALE: -@CD_ICC_ERROR_NO_DATA: -@CD_ICC_ERROR_FAILED_TO_SAVE: -@CD_ICC_ERROR_FAILED_TO_CREATE: -@CD_ICC_ERROR_INVALID_COLORSPACE: -@CD_ICC_ERROR_CORRUPTION_DETECTED: -@CD_ICC_ERROR_INTERNAL: - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@CD_ICC_LOAD_FLAGS_NONE: -@CD_ICC_LOAD_FLAGS_NAMED_COLORS: -@CD_ICC_LOAD_FLAGS_TRANSLATIONS: -@CD_ICC_LOAD_FLAGS_METADATA: -@CD_ICC_LOAD_FLAGS_FALLBACK_MD5: -@CD_ICC_LOAD_FLAGS_PRIMARIES: -@CD_ICC_LOAD_FLAGS_CHARACTERIZATION: -@CD_ICC_LOAD_FLAGS_ALL: - - - - - - -@CD_ICC_SAVE_FLAGS_NONE: - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@icc: -@data: -@data_len: -@flags: -@error: -@Returns: - - - - - - - -@icc: -@file: -@flags: -@cancellable: -@error: -@Returns: - - - - - - - -@icc: -@fd: -@flags: -@error: -@Returns: - - - - - - - -@icc: -@handle: -@flags: -@error: -@Returns: - - - - - - - -@icc: -@flags: -@error: -@Returns: - - - - - - - -@icc: -@file: -@flags: -@cancellable: -@error: -@Returns: - - - - - - - -@icc: -@flags: -@cancellable: -@error: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@filename: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@version: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@kind: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@colorspace: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@key: -@Returns: - - - - - - - -@icc: -@key: -@value: - - - - - - - -@icc: -@key: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@locale: -@error: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@data: - - - - - - - -@icc: -@locale: -@error: -@Returns: - - - - - - - -@icc: -@locale: -@error: -@Returns: - - - - - - - -@icc: -@locale: -@error: -@Returns: - - - - - - - -@icc: -@locale: -@value: - - - - - - - -@icc: -@values: - - - - - - - -@icc: -@locale: -@value: - - - - - - - -@icc: -@values: - - - - - - - -@icc: -@locale: -@value: - - - - - - - -@icc: -@values: - - - - - - - -@icc: -@locale: -@value: - - - - - - - -@icc: -@values: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@Returns: - - - - - - - -@icc: -@gamma_value: -@red: -@green: -@blue: -@white: -@error: -@Returns: - - - - - - - -@icc: -@edid: -@error: -@Returns: - - - - - - - -@icc: -@error: -@Returns: - - - - - - - -@icc: -@size: -@error: -@Returns: - - - - - - - -@icc: -@vcgt: -@error: -@Returns: - - - - - - - -@icc: -@size: -@error: -@Returns: - - - - - - - -@icc: -@error: -@Returns: - - - - - - - -@icc: -@tag: -@error: -@Returns: - - - - - - - -@icc: -@tag: -@data: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-icc-store.sgml colord-1.3.2/doc/api/tmpl/cd-icc-store.sgml --- colord-1.2.12/doc/api/tmpl/cd-icc-store.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-icc-store.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ - -CdIccStore - - - - - - - - - - - - - - - - - - - - - - - - - -@CD_ICC_STORE_SEARCH_FLAGS_NONE: -@CD_ICC_STORE_SEARCH_FLAGS_CREATE_LOCATION: - - - - - - -@CD_ICC_STORE_SEARCH_KIND_SYSTEM: -@CD_ICC_STORE_SEARCH_KIND_MACHINE: -@CD_ICC_STORE_SEARCH_KIND_USER: - - - - - - -@void: -@Returns: - - - - - - - -@store: -@location: -@search_flags: -@cancellable: -@error: -@Returns: - - - - - - - -@store: -@search_kind: -@search_flags: -@cancellable: -@error: -@Returns: - - - - - - - -@store: -@load_flags: - - - - - - - -@store: -@Returns: - - - - - - - -@store: -@cache: - - - - - - - -@store: -@Returns: - - - - - - - -@store: -@filename: -@Returns: - - - - - - - -@store: -@checksum: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-icc-utils.sgml colord-1.3.2/doc/api/tmpl/cd-icc-utils.sgml --- colord-1.2.12/doc/api/tmpl/cd-icc-utils.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-icc-utils.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ - -cd-icc-utils - - - - - - - - - - - - - - - - - - - - - - - - - -@icc: -@icc_reference: -@coverage: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-interp-akima.sgml colord-1.3.2/doc/api/tmpl/cd-interp-akima.sgml --- colord-1.2.12/doc/api/tmpl/cd-interp-akima.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-interp-akima.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ - -cd-interp-akima - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-interp-linear.sgml colord-1.3.2/doc/api/tmpl/cd-interp-linear.sgml --- colord-1.2.12/doc/api/tmpl/cd-interp-linear.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-interp-linear.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ - -cd-interp-linear - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-interp.sgml colord-1.3.2/doc/api/tmpl/cd-interp.sgml --- colord-1.2.12/doc/api/tmpl/cd-interp.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-interp.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,221 +0,0 @@ - -cd-interp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@interp: -@error: -@Returns: - - - - - - - -@interp: -@value: -@error: -@Returns: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@CD_INTERP_ERROR_FAILED: - - - - - - -@CD_INTERP_KIND_LINEAR: -@CD_INTERP_KIND_AKIMA: - - - - - - -@void: -@Returns: - - - - - - - -@interp: -@Returns: - - - - - - - -@interp: -@Returns: - - - - - - - -@interp: -@Returns: - - - - - - - -@interp: -@Returns: - - - - - - - -@interp: -@x: -@y: - - - - - - - -@interp: -@error: -@Returns: - - - - - - - -@interp: -@value: -@error: -@Returns: - - - - - - - -@kind: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-it8.sgml colord-1.3.2/doc/api/tmpl/cd-it8.sgml --- colord-1.2.12/doc/api/tmpl/cd-it8.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-it8.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,458 +0,0 @@ - -cd-it8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@CD_IT8_ERROR_FAILED: -@CD_IT8_ERROR_INVALID_FORMAT: -@CD_IT8_ERROR_UNKNOWN_KIND: - - - - - - -@CD_IT8_KIND_UNKNOWN: -@CD_IT8_KIND_TI1: -@CD_IT8_KIND_TI3: -@CD_IT8_KIND_CCMX: -@CD_IT8_KIND_CAL: -@CD_IT8_KIND_CCSS: -@CD_IT8_KIND_SPECT: -@CD_IT8_KIND_CMF: - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@kind: -@Returns: - - - - - - - -@it8: -@data: -@size: -@error: -@Returns: - - - - - - - -@it8: -@file: -@error: -@Returns: - - - - - - - -@it8: -@file: -@error: -@Returns: - - - - - - - -@it8: -@data: -@size: -@error: -@Returns: - - - - - - - -@it8: -@kind: - - - - - - - -@it8: -@normalized: - - - - - - - -@it8: -@originator: - - - - - - - -@it8: -@title: - - - - - - - -@it8: -@spectral: - - - - - - - -@it8: -@instrument: - - - - - - - -@it8: -@reference: - - - - - - - -@it8: -@enable_created: - - - - - - - -@it8: -@rgb: -@xyz: - - - - - - - -@it8: -@option: - - - - - - - -@it8: -@matrix: - - - - - - - -@it8: -@data: - - - - - - - -@it8: -@spectrum: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@idx: -@rgb: -@xyz: -@Returns: - - - - - - - -@it8: -@Returns: - - - - - - - -@it8: -@id: -@Returns: - - - - - - - -@it8: -@option: -@Returns: - - - - - - - -@it8: -@R: -@G: -@B: -@delta: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-it8-utils.sgml colord-1.3.2/doc/api/tmpl/cd-it8-utils.sgml --- colord-1.2.12/doc/api/tmpl/cd-it8-utils.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-it8-utils.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ - -cd-it8-utils - - - - - - - - - - - - - - - - - - - - - - - - - -@it8_reference: -@it8_measured: -@it8_ccmx: -@error: -@Returns: - - - - - - - -@cmf: -@illuminant: -@spectrum: -@value: -@resolution: -@error: -@Returns: - - - - - - - -@cmf: -@tcs: -@illuminant: -@value: -@resolution: -@error: -@Returns: - - - - - - - -@it8: -@gamma_y: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-math.sgml colord-1.3.2/doc/api/tmpl/cd-math.sgml --- colord-1.2.12/doc/api/tmpl/cd-math.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-math.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,250 +0,0 @@ - -cd-math - - - - - - - - - - - - - - - - - - - - - - - - - -@m00: -@m01: -@m02: -@m10: -@m11: -@m12: -@m20: -@m21: -@m22: - - - - - - -@v0: -@v1: -@v2: - - - - - - -@src: - - - - - - - -@src1: -@src2: -@dest: - - - - - - - -@src1: -@src2: -@dest: - - - - - - - -@src: -@value: -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@src1: -@src2: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@dest: -@v0: -@v1: -@v2: - - - - - - - -@dest: -@m00: -@m01: -@m02: -@m10: -@m11: -@m12: -@m20: -@m21: -@m22: - - - - - - - -@src: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@src: - - - - - - - -@mat_src: -@value: -@mat_dest: - - - - - - - -@mat_src: -@vec_src: -@vec_dest: - - - - - - - -@mat_src1: -@mat_src2: -@mat_dest: - - - - - - - -@src: -@dest: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@dest: - - - - - - - -@src: -@dest: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-profile.sgml colord-1.3.2/doc/api/tmpl/cd-profile.sgml --- colord-1.2.12/doc/api/tmpl/cd-profile.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-profile.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,415 +0,0 @@ - -cd-profile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@device: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@object_path: -@Returns: - - - - - - - -@profile: -@cancellable: -@callback: -@user_data: - - - - - - - -@profile: -@res: -@error: -@Returns: - - - - - - - -@profile: -@key: -@value: -@cancellable: -@callback: -@user_data: - - - - - - - -@profile: -@res: -@error: -@Returns: - - - - - - - -@profile: -@cancellable: -@callback: -@user_data: - - - - - - - -@profile: -@res: -@error: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@key: -@Returns: - - - - - - - -@profile: -@object_path: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile1: -@profile2: -@Returns: - - - - - - - -@profile: -@Returns: - - - - - - - -@profile: -@flags: -@cancellable: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-profile-sync.sgml colord-1.3.2/doc/api/tmpl/cd-profile-sync.sgml --- colord-1.2.12/doc/api/tmpl/cd-profile-sync.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-profile-sync.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ - -cd-profile-sync - - - - - - - - - - - - - - - - - - - - - - - - - -@profile: -@cancellable: -@error: -@Returns: - - - - - - - -@profile: -@key: -@value: -@cancellable: -@error: -@Returns: - - - - - - - -@profile: -@cancellable: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-quirk.sgml colord-1.3.2/doc/api/tmpl/cd-quirk.sgml --- colord-1.2.12/doc/api/tmpl/cd-quirk.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-quirk.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ - -cd-quirk - - - - - - - - - - - - - - - - - - - - - - - - - -@vendor: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-sensor.sgml colord-1.3.2/doc/api/tmpl/cd-sensor.sgml --- colord-1.2.12/doc/api/tmpl/cd-sensor.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-sensor.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,440 +0,0 @@ - -cd-sensor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@sensor: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@object_path: -@Returns: - - - - - - - -@sensor: -@cancellable: -@callback: -@user_data: - - - - - - - -@sensor: -@res: -@error: -@Returns: - - - - - - - -@sensor: -@cancellable: -@callback: -@user_data: - - - - - - - -@sensor: -@res: -@error: -@Returns: - - - - - - - -@sensor: -@cancellable: -@callback: -@user_data: - - - - - - - -@sensor: -@res: -@error: -@Returns: - - - - - - - -@sensor: -@values: -@cancellable: -@callback: -@user_data: - - - - - - - -@sensor: -@res: -@error: -@Returns: - - - - - - - -@sensor: -@cap: -@cancellable: -@callback: -@user_data: - - - - - - - -@sensor: -@res: -@error: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@cap: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@key: -@Returns: - - - - - - - -@sensor: -@Returns: - - - - - - - -@sensor: -@key: -@Returns: - - - - - - - -@sensor: -@object_path: - - - - - - - -@sensor1: -@sensor2: -@Returns: - - - - - - - -@sensor: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-sensor-sync.sgml colord-1.3.2/doc/api/tmpl/cd-sensor-sync.sgml --- colord-1.2.12/doc/api/tmpl/cd-sensor-sync.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-sensor-sync.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ - -cd-sensor-sync - - - - - - - - - - - - - - - - - - - - - - - - - -@sensor: -@cancellable: -@error: -@Returns: - - - - - - - -@sensor: -@cancellable: -@error: -@Returns: - - - - - - - -@sensor: -@cancellable: -@error: -@Returns: - - - - - - - -@sensor: -@values: -@cancellable: -@error: -@Returns: - - - - - - - -@sensor: -@cap: -@cancellable: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-spectrum.sgml colord-1.3.2/doc/api/tmpl/cd-spectrum.sgml --- colord-1.2.12/doc/api/tmpl/cd-spectrum.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-spectrum.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ - -cd-spectrum - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@reserved_size: -@Returns: - - - - - - - -@temperature: -@Returns: - - - - - - - -@spectrum: - - - - - - - -@spectrum: -@Returns: - - - - - - - -@spectrum: -@wavelength: -@value: - - - - - - - -@spectrum: -@value: - - - - - - - -@spectrum: -@Returns: - - - - - - - -@spectrum: -@Returns: - - - - - - - -@spectrum: -@Returns: - - - - - - - -@spectrum: -@Returns: - - - - - - - -@spectrum: -@Returns: - - - - - - - -@spectrum: -@Returns: - - - - - - - -@spectrum: -@Returns: - - - - - - - -@spectrum: -@idx: -@Returns: - - - - - - - -@spectrum: -@idx: -@Returns: - - - - - - - -@spectrum: -@idx: -@Returns: - - - - - - - -@spectrum: -@wavelength: -@Returns: - - - - - - - -@spectrum: -@id: - - - - - - - -@spectrum: -@value: - - - - - - - -@spectrum: -@start: - - - - - - - -@spectrum: -@end: - - - - - - - -@spectrum: -@norm: - - - - - - - -@spectrum: -@idx: -@data: - - - - - - - -@spectrum: -@data: - - - - - - - -@s1: -@s2: -@resolution: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-test-shared.sgml colord-1.3.2/doc/api/tmpl/cd-test-shared.sgml --- colord-1.2.12/doc/api/tmpl/cd-test-shared.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-test-shared.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ - -cd-test-shared - - - - - - - - - - - - - - - - - - - - - - - - - -@filename: -@Returns: - - - - - - - -@void: - - - - - - - -@timeout_ms: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-transform.sgml colord-1.3.2/doc/api/tmpl/cd-transform.sgml --- colord-1.2.12/doc/api/tmpl/cd-transform.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-transform.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ - -cd-transform - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@CD_TRANSFORM_ERROR_FAILED_TO_SETUP_TRANSFORM: -@CD_TRANSFORM_ERROR_INVALID_COLORSPACE: -@CD_TRANSFORM_ERROR_LAST: - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@transform: -@icc: - - - - - - - -@transform: -@pixel_format: - - - - - - - -@transform: -@Returns: - - - - - - - -@transform: -@Returns: - - - - - - - -@transform: -@icc: - - - - - - - -@transform: -@pixel_format: - - - - - - - -@transform: -@Returns: - - - - - - - -@transform: -@Returns: - - - - - - - -@transform: -@icc: - - - - - - - -@transform: -@Returns: - - - - - - - -@transform: -@rendering_intent: - - - - - - - -@transform: -@Returns: - - - - - - - -@transform: -@bpc: - - - - - - - -@transform: -@Returns: - - - - - - - -@transform: -@max_threads: - - - - - - - -@transform: -@Returns: - - - - - - - -@transform: -@data_in: -@data_out: -@width: -@height: -@rowstride: -@cancellable: -@error: -@Returns: - - diff -Nru colord-1.2.12/doc/api/tmpl/cd-version.sgml colord-1.3.2/doc/api/tmpl/cd-version.sgml --- colord-1.2.12/doc/api/tmpl/cd-version.sgml 2015-08-19 14:23:34.000000000 +0000 +++ colord-1.3.2/doc/api/tmpl/cd-version.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ - -cd-version - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@major: -@minor: -@micro: - - diff -Nru colord-1.2.12/doc/api/version.xml colord-1.3.2/doc/api/version.xml --- colord-1.2.12/doc/api/version.xml 2015-07-20 09:49:03.000000000 +0000 +++ colord-1.3.2/doc/api/version.xml 2016-02-17 13:32:58.000000000 +0000 @@ -1 +1 @@ -1.2.12 +1.3.2 diff -Nru colord-1.2.12/doc/Makefile.in colord-1.3.2/doc/Makefile.in --- colord-1.2.12/doc/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/doc/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -303,6 +303,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -407,6 +408,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/examples/Makefile.in colord-1.3.2/examples/Makefile.in --- colord-1.2.12/examples/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/examples/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -314,6 +314,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -418,6 +419,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/gtk-doc.make colord-1.3.2/gtk-doc.make --- colord-1.2.12/gtk-doc.make 2015-04-22 09:56:46.000000000 +0000 +++ colord-1.3.2/gtk-doc.make 2016-02-17 13:19:24.000000000 +0000 @@ -25,6 +25,7 @@ SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -33,9 +34,9 @@ $(HTML_IMAGES) \ $(SETUP_FILES) -DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -86,21 +87,19 @@ setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file` ;\ + destdir=`dirname $(abs_builddir)/$$file`; \ test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp + #### scan #### GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) @@ -120,7 +119,7 @@ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -137,35 +136,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - -GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; - -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - $(AM_V_at)touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - #### xml #### GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XML_0=@echo " DOC Building XML"; -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -175,6 +153,17 @@ sgml.stamp: sgml-build.stamp @true +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + ) > $@ + #### html #### GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) @@ -185,17 +174,17 @@ GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -217,11 +206,11 @@ GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -246,13 +235,15 @@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: @@ -302,9 +293,7 @@ endif dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local - @mkdir $(distdir)/tmpl @mkdir $(distdir)/html - @-cp ./tmpl/*.sgml $(distdir)/tmpl @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ @-cp ./$(DOC_MODULE).types $(distdir)/ diff -Nru colord-1.2.12/lib/colord/cd-cleanup.h colord-1.3.2/lib/colord/cd-cleanup.h --- colord-1.2.12/lib/colord/cd-cleanup.h 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-cleanup.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Colin Walters . - * Copyright (C) 2014 Richard Hughes - * - * Licensed under the GNU Lesser General Public License Version 2.1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __CD_CLEANUP_H__ -#define __CD_CLEANUP_H__ - -#include - -G_BEGIN_DECLS - -#define GS_DEFINE_CLEANUP_FUNCTION(Type, name, func) \ - static inline void name (void *v) \ - { \ - func (*(Type*)v); \ - } - -#define GS_DEFINE_CLEANUP_FUNCTION0(Type, name, func) \ - static inline void name (void *v) \ - { \ - if (*(Type*)v) \ - func (*(Type*)v); \ - } - -#define GS_DEFINE_CLEANUP_FUNCTIONt(Type, name, func) \ - static inline void name (void *v) \ - { \ - if (*(Type*)v) \ - func (*(Type*)v, TRUE); \ - } - -GS_DEFINE_CLEANUP_FUNCTION0(GArray*, gs_local_array_unref, g_array_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GBytes*, gs_local_bytes_unref, g_bytes_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GChecksum*, gs_local_checksum_free, g_checksum_free) -GS_DEFINE_CLEANUP_FUNCTION0(GDir*, gs_local_dir_close, g_dir_close) -GS_DEFINE_CLEANUP_FUNCTION0(GError*, gs_local_free_error, g_error_free) -GS_DEFINE_CLEANUP_FUNCTION0(GHashTable*, gs_local_hashtable_unref, g_hash_table_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GKeyFile*, gs_local_keyfile_unref, g_key_file_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GMarkupParseContext*, gs_local_markup_parse_context_unref, g_markup_parse_context_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GObject*, gs_local_obj_unref, g_object_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GPtrArray*, gs_local_ptrarray_unref, g_ptr_array_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GTimer*, gs_local_destroy_timer, g_timer_destroy) -GS_DEFINE_CLEANUP_FUNCTION0(GVariantBuilder*, gs_local_variant_builder_unref, g_variant_builder_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GVariant*, gs_local_variant_unref, g_variant_unref) -GS_DEFINE_CLEANUP_FUNCTION0(GVariantIter*, gs_local_variant_iter_free, g_variant_iter_free) - -GS_DEFINE_CLEANUP_FUNCTIONt(GString*, gs_local_free_string, g_string_free) - -GS_DEFINE_CLEANUP_FUNCTION(char**, gs_local_strfreev, g_strfreev) -GS_DEFINE_CLEANUP_FUNCTION(GList*, gs_local_free_list, g_list_free) -GS_DEFINE_CLEANUP_FUNCTION(void*, gs_local_free, g_free) - -#define _cleanup_dir_close_ __attribute__ ((cleanup(gs_local_dir_close))) -#define _cleanup_timer_destroy_ __attribute__ ((cleanup(gs_local_destroy_timer))) -#define _cleanup_free_ __attribute__ ((cleanup(gs_local_free))) -#define _cleanup_checksum_free_ __attribute__ ((cleanup(gs_local_checksum_free))) -#define _cleanup_error_free_ __attribute__ ((cleanup(gs_local_free_error))) -#define _cleanup_list_free_ __attribute__ ((cleanup(gs_local_free_list))) -#define _cleanup_string_free_ __attribute__ ((cleanup(gs_local_free_string))) -#define _cleanup_strv_free_ __attribute__ ((cleanup(gs_local_strfreev))) -#define _cleanup_variant_iter_free_ __attribute__ ((cleanup(gs_local_variant_iter_free))) -#define _cleanup_array_unref_ __attribute__ ((cleanup(gs_local_array_unref))) -#define _cleanup_bytes_unref_ __attribute__ ((cleanup(gs_local_bytes_unref))) -#define _cleanup_hashtable_unref_ __attribute__ ((cleanup(gs_local_hashtable_unref))) -#define _cleanup_keyfile_unref_ __attribute__ ((cleanup(gs_local_keyfile_unref))) -#define _cleanup_markup_parse_context_unref_ __attribute__ ((cleanup(gs_local_markup_parse_context_unref))) -#define _cleanup_object_unref_ __attribute__ ((cleanup(gs_local_obj_unref))) -#define _cleanup_ptrarray_unref_ __attribute__ ((cleanup(gs_local_ptrarray_unref))) -#define _cleanup_variant_unref_ __attribute__ ((cleanup(gs_local_variant_unref))) - -G_END_DECLS - -#endif diff -Nru colord-1.2.12/lib/colord/cd-client.c colord-1.3.2/lib/colord/cd-client.c --- colord-1.2.12/lib/colord/cd-client.c 2015-05-27 09:36:39.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-client.c 2016-03-15 12:25:07.000000000 +0000 @@ -45,7 +45,6 @@ #include #include "cd-enum.h" -#include "cd-cleanup.h" #include "cd-client.h" #include "cd-client-sync.h" #include "cd-device.h" @@ -57,7 +56,7 @@ static void cd_client_init (CdClient *client); static void cd_client_finalize (GObject *object); -#define CD_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_CLIENT, CdClientPrivate)) +#define GET_PRIVATE(o) (cd_client_get_instance_private (o)) #define CD_CLIENT_MESSAGE_TIMEOUT 15000 /* ms */ #define CD_CLIENT_IMPORT_DAEMON_TIMEOUT 5000 /* ms */ @@ -70,13 +69,13 @@ * * Private #CdClient data **/ -struct _CdClientPrivate +typedef struct { GDBusProxy *proxy; gchar *daemon_version; gchar *system_vendor; gchar *system_model; -}; +} CdClientPrivate; enum { SIGNAL_CHANGED, @@ -104,7 +103,7 @@ static guint signals [SIGNAL_LAST] = { 0 }; static gpointer cd_client_object = NULL; -G_DEFINE_TYPE (CdClient, cd_client, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdClient, cd_client, G_TYPE_OBJECT) /** * cd_client_error_quark: @@ -142,9 +141,10 @@ const gchar * cd_client_get_daemon_version (CdClient *client) { + CdClientPrivate *priv = GET_PRIVATE (client); g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (client->priv->proxy != NULL, NULL); - return client->priv->daemon_version; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->daemon_version; } /** @@ -160,9 +160,10 @@ const gchar * cd_client_get_system_vendor (CdClient *client) { + CdClientPrivate *priv = GET_PRIVATE (client); g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (client->priv->proxy != NULL, NULL); - return client->priv->system_vendor; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->system_vendor; } /** @@ -178,9 +179,10 @@ const gchar * cd_client_get_system_model (CdClient *client) { + CdClientPrivate *priv = GET_PRIVATE (client); g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (client->priv->proxy != NULL, NULL); - return client->priv->system_model; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->system_model; } /** @@ -196,8 +198,9 @@ gboolean cd_client_get_connected (CdClient *client) { + CdClientPrivate *priv = GET_PRIVATE (client); g_return_val_if_fail (CD_IS_CLIENT (client), FALSE); - return client->priv->proxy != NULL; + return priv->proxy != NULL; } /** @@ -215,8 +218,8 @@ gboolean cd_client_get_has_server (CdClient *client) { - _cleanup_free_ gchar *name_owner = NULL; - _cleanup_object_unref_ GDBusProxy *proxy = NULL; + g_autofree gchar *name_owner = NULL; + g_autoptr(GDBusProxy) proxy = NULL; g_return_val_if_fail (CD_IS_CLIENT (client), FALSE); @@ -251,10 +254,10 @@ GVariant *parameters, CdClient *client) { - _cleanup_free_ gchar *object_path_tmp = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; - _cleanup_object_unref_ CdSensor *sensor = NULL; + g_autofree gchar *object_path_tmp = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; + g_autoptr(CdSensor) sensor = NULL; if (g_strcmp0 (signal_name, "Changed") == 0) { g_warning ("changed"); @@ -338,17 +341,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, client), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -356,64 +350,63 @@ GAsyncResult *res, gpointer user_data) { - CdClient *client = CD_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (user_data))); - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *daemon_version = NULL; - _cleanup_variant_unref_ GVariant *system_model = NULL; - _cleanup_variant_unref_ GVariant *system_vendor = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) daemon_version = NULL; + g_autoptr(GVariant) system_model = NULL; + g_autoptr(GVariant) system_vendor = NULL; + CdClient *client = CD_CLIENT (g_task_get_source_object (task)); + CdClientPrivate *priv = GET_PRIVATE (client); /* get result */ - client->priv->proxy = g_dbus_proxy_new_for_bus_finish (res, &error); - if (client->priv->proxy == NULL) { - g_simple_async_result_set_error (G_SIMPLE_ASYNC_RESULT (res_source), - CD_CLIENT_ERROR, - CD_CLIENT_ERROR_INTERNAL, - "%s", - error->message); - g_simple_async_result_complete (G_SIMPLE_ASYNC_RESULT (res_source)); + priv->proxy = g_dbus_proxy_new_for_bus_finish (res, &error); + if (priv->proxy == NULL) { + g_task_return_new_error (task, + CD_CLIENT_ERROR, + CD_CLIENT_ERROR_INTERNAL, + "%s", + error->message); return; } /* get daemon version */ - daemon_version = g_dbus_proxy_get_cached_property (client->priv->proxy, + daemon_version = g_dbus_proxy_get_cached_property (priv->proxy, CD_CLIENT_PROPERTY_DAEMON_VERSION); if (daemon_version != NULL) { - g_free (client->priv->daemon_version); - client->priv->daemon_version = g_variant_dup_string (daemon_version, NULL); + g_free (priv->daemon_version); + priv->daemon_version = g_variant_dup_string (daemon_version, NULL); } /* get system info */ - system_vendor = g_dbus_proxy_get_cached_property (client->priv->proxy, + system_vendor = g_dbus_proxy_get_cached_property (priv->proxy, CD_CLIENT_PROPERTY_SYSTEM_VENDOR); if (system_vendor != NULL) { - g_free (client->priv->system_vendor); - client->priv->system_vendor = g_variant_dup_string (system_vendor, NULL); + g_free (priv->system_vendor); + priv->system_vendor = g_variant_dup_string (system_vendor, NULL); } /* get system model */ - system_model = g_dbus_proxy_get_cached_property (client->priv->proxy, + system_model = g_dbus_proxy_get_cached_property (priv->proxy, CD_CLIENT_PROPERTY_SYSTEM_MODEL); if (system_model != NULL) { - g_free (client->priv->system_model); - client->priv->system_model = g_variant_dup_string (system_model, NULL); + g_free (priv->system_model); + priv->system_model = g_variant_dup_string (system_model, NULL); } /* get signals from DBus */ - g_signal_connect (client->priv->proxy, - "g-signal", - G_CALLBACK (cd_client_dbus_signal_cb), - client); + g_signal_connect_object (priv->proxy, + "g-signal", + G_CALLBACK (cd_client_dbus_signal_cb), + client, 0); /* watch to see if it's fallen off the bus */ - g_signal_connect (client->priv->proxy, - "notify::g-name-owner", - G_CALLBACK (cd_client_owner_notify_cb), - client); + g_signal_connect_object (priv->proxy, + "notify::g-name-owner", + G_CALLBACK (cd_client_owner_notify_cb), + client, 0); /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -433,20 +426,18 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_connect); + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); /* already connected */ - if (client->priv->proxy != NULL) { - g_simple_async_result_set_op_res_gboolean (res, TRUE); - g_simple_async_result_complete_in_idle (res); + if (priv->proxy != NULL) { + g_task_return_boolean (task, TRUE); + g_object_unref (task); return; } @@ -459,7 +450,7 @@ COLORD_DBUS_INTERFACE, cancellable, cd_client_connect_cb, - res); + task); } /**********************************************************************/ @@ -481,17 +472,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } /** @@ -500,7 +482,7 @@ static void cd_client_fixup_dbus_error (GError *error) { - _cleanup_free_ gchar *name = NULL; + g_autofree gchar *name = NULL; g_return_if_fail (error != NULL); @@ -521,32 +503,28 @@ gpointer user_data) { CdDevice *device; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create CdDevice object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); device = cd_device_new (); cd_device_set_object_path (device, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - device, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, device, (GDestroyNotify) g_object_unref); } /** @@ -573,19 +551,17 @@ GAsyncReadyCallback callback, gpointer user_data) { + CdClientPrivate *priv = GET_PRIVATE (client); const gchar *value; - GSimpleAsyncResult *res; + GTask *task = NULL; GVariantBuilder builder; GList *list, *l; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_create_device); + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); /* add properties */ g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); @@ -607,7 +583,7 @@ "unknown"); } - g_dbus_proxy_call (client->priv->proxy, + g_dbus_proxy_call (priv->proxy, "CreateDevice", g_variant_new ("(ssa{ss})", id, @@ -617,7 +593,7 @@ -1, cancellable, cd_client_create_device_cb, - res); + task); } /**********************************************************************/ @@ -639,17 +615,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -658,18 +625,18 @@ gpointer user_data) { CdProfile *profile; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GDBusMessage *reply = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GDBusMessage) reply = NULL; + g_autoptr(GTask) task = G_TASK (user_data); reply = g_dbus_connection_send_message_with_reply_finish (G_DBUS_CONNECTION (source_object), res, &error); if (reply == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } @@ -677,8 +644,8 @@ if (g_dbus_message_get_message_type (reply) == G_DBUS_MESSAGE_TYPE_ERROR) { g_dbus_message_to_gerror (reply, &error); cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } @@ -689,10 +656,7 @@ cd_profile_set_object_path (profile, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - profile, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, profile, (GDestroyNotify) g_object_unref); } /** @@ -719,23 +683,22 @@ GAsyncReadyCallback callback, gpointer user_data) { + CdClientPrivate *priv = GET_PRIVATE (client); GDBusConnection *connection; gint fd = -1; GList *list, *l; GVariant *body; GVariantBuilder builder; - GSimpleAsyncResult *res; - _cleanup_object_unref_ GDBusMessage *request = NULL; - _cleanup_object_unref_ GUnixFDList *fd_list = NULL; + GTask *task = NULL; + g_autoptr(GDBusMessage) request = NULL; + g_autoptr(GUnixFDList) fd_list = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + g_return_if_fail (priv->proxy != NULL); g_return_if_fail (id != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_create_profile); + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); /* add properties */ g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); @@ -774,12 +737,11 @@ gint retval; fd = open (filename, O_RDONLY); if (fd < 0) { - g_simple_async_result_set_error (res, - CD_CLIENT_ERROR, - CD_CLIENT_ERROR_INTERNAL, - "Failed to open %s", - filename); - g_simple_async_result_complete_in_idle (res); + g_task_return_new_error (task, + CD_CLIENT_ERROR, + CD_CLIENT_ERROR_INTERNAL, + "Failed to open %s", + filename); return; } @@ -804,7 +766,7 @@ g_dbus_message_set_body (request, body); /* send sync message to the bus */ - connection = g_dbus_proxy_get_connection (client->priv->proxy); + connection = g_dbus_proxy_get_connection (priv->proxy); g_dbus_connection_send_message_with_reply (connection, request, G_DBUS_SEND_MESSAGE_FLAGS_NONE, @@ -812,7 +774,7 @@ NULL, cancellable, cd_client_create_profile_cb, - res); + task); } /**********************************************************************/ @@ -839,8 +801,8 @@ { const gchar *checksum; const gchar *filename; - _cleanup_free_ gchar *profile_id = NULL; - _cleanup_hashtable_unref_ GHashTable *profile_props = NULL; + g_autofree gchar *profile_id = NULL; + g_autoptr(GHashTable) profile_props = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (CD_IS_ICC (icc)); @@ -896,8 +858,8 @@ static GFile * cd_client_import_get_profile_destination (GFile *file) { - _cleanup_free_ gchar *basename = NULL; - _cleanup_free_ gchar *destination = NULL; + g_autofree gchar *basename = NULL; + g_autofree gchar *destination = NULL; g_return_val_if_fail (file != NULL, NULL); @@ -916,7 +878,7 @@ GCancellable *cancellable, GError **error) { - _cleanup_object_unref_ GFile *parent = NULL; + g_autoptr(GFile) parent = NULL; g_return_val_if_fail (source != NULL, FALSE); g_return_val_if_fail (destination != NULL, FALSE); @@ -937,14 +899,11 @@ } typedef struct { - CdClient *client; - GCancellable *cancellable; GFile *dest; GFile *file; - GSimpleAsyncResult *res; guint hangcheck_id; guint profile_added_id; -} CdClientImportHelper; +} CdClientImportTaskData; /** * cd_client_import_profile_finish: @@ -963,33 +922,20 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void -cd_client_import_free_helper (CdClientImportHelper *helper) -{ - g_object_unref (helper->file); - g_object_unref (helper->dest); - if (helper->cancellable != NULL) - g_object_unref (helper->cancellable); - if (helper->profile_added_id > 0) - g_signal_handler_disconnect (helper->client, helper->profile_added_id); - if (helper->hangcheck_id > 0) - g_source_remove (helper->hangcheck_id); - g_object_unref (helper->client); - g_object_unref (helper->res); - g_free (helper); +cd_client_import_task_data_free (CdClientImportTaskData *tdata) +{ + g_object_unref (tdata->file); + g_object_unref (tdata->dest); +// if (tdata->profile_added_id > 0) +// g_signal_handler_disconnect (tdata->client, tdata->profile_added_id); + if (tdata->hangcheck_id > 0) + g_source_remove (tdata->hangcheck_id); + g_free (tdata); } static void @@ -997,27 +943,22 @@ CdProfile *profile, gpointer user_data) { - CdClientImportHelper *helper = (CdClientImportHelper *) user_data; - - /* success */ - g_simple_async_result_set_op_res_gpointer (helper->res, - g_object_ref (profile), - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (helper->res); - cd_client_import_free_helper (helper); + GTask *task = G_TASK (user_data); + g_task_return_pointer (task, g_object_ref (profile), (GDestroyNotify) g_object_unref); + g_object_unref (task); } static gboolean cd_client_import_hangcheck_cb (gpointer user_data) { - CdClientImportHelper *helper = (CdClientImportHelper *) user_data; - g_simple_async_result_set_error (helper->res, - CD_CLIENT_ERROR, - CD_CLIENT_ERROR_INTERNAL, - "The profile was not added in time"); - g_simple_async_result_complete_in_idle (helper->res); - helper->hangcheck_id = 0; - cd_client_import_free_helper (helper); + GTask *task = G_TASK (user_data); + CdClientImportTaskData *tdata = g_task_get_task_data (task); + g_task_return_new_error (task, + CD_CLIENT_ERROR, + CD_CLIENT_ERROR_INTERNAL, + "The profile was not added in time"); + tdata->hangcheck_id = 0; + g_object_unref (task); return G_SOURCE_REMOVE; } @@ -1026,34 +967,32 @@ GAsyncResult *res, gpointer user_data) { - CdClientImportHelper *helper = (CdClientImportHelper *) user_data; + GTask *task = G_TASK (user_data); + CdClient *client = CD_CLIENT (source_object); + CdClientImportTaskData *tdata = g_task_get_task_data (task); gboolean ret; - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(CdProfile) profile = NULL; /* does the profile already exist */ - profile = cd_client_find_profile_by_filename_finish (CD_CLIENT (source_object), - res, - &error); + profile = cd_client_find_profile_by_filename_finish (client, res, &error); if (profile != NULL) { - _cleanup_free_ gchar *filename = NULL; - filename = g_file_get_path (helper->dest); - g_simple_async_result_set_error (helper->res, - CD_CLIENT_ERROR, - CD_CLIENT_ERROR_ALREADY_EXISTS, - "The profile %s already exists", - filename); - g_simple_async_result_complete_in_idle (helper->res); - cd_client_import_free_helper (helper); + g_autofree gchar *filename = NULL; + filename = g_file_get_path (tdata->dest); + g_task_return_new_error (task, + CD_CLIENT_ERROR, + CD_CLIENT_ERROR_ALREADY_EXISTS, + "The profile %s already exists", + filename); + g_object_unref (task); return; } if (!g_error_matches (error, CD_CLIENT_ERROR, CD_CLIENT_ERROR_NOT_FOUND)) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (helper->res, error); - g_simple_async_result_complete_in_idle (helper->res); - cd_client_import_free_helper (helper); + g_task_return_error (task, error); + g_object_unref (task); return; } @@ -1062,26 +1001,25 @@ /* watch for a new profile to be detected and added, * but time out after a couple of seconds */ - helper->hangcheck_id = g_timeout_add (CD_CLIENT_IMPORT_DAEMON_TIMEOUT, - cd_client_import_hangcheck_cb, - helper); - helper->profile_added_id = g_signal_connect (helper->client, "profile-added", - G_CALLBACK (cd_client_import_profile_added_cb), - helper); + tdata->hangcheck_id = g_timeout_add (CD_CLIENT_IMPORT_DAEMON_TIMEOUT, + cd_client_import_hangcheck_cb, + task); + tdata->profile_added_id = g_signal_connect (client, "profile-added", + G_CALLBACK (cd_client_import_profile_added_cb), + task); /* copy profile to the correct place */ - ret = cd_client_import_mkdir_and_copy (helper->file, - helper->dest, - helper->cancellable, + ret = cd_client_import_mkdir_and_copy (tdata->file, + tdata->dest, + g_task_get_cancellable (task), &error); if (!ret) { - g_simple_async_result_set_error (helper->res, - CD_CLIENT_ERROR, - CD_CLIENT_ERROR_INTERNAL, - "Failed to copy: %s", - error->message); - g_simple_async_result_complete_in_idle (helper->res); - cd_client_import_free_helper (helper); + g_task_return_new_error (task, + CD_CLIENT_ERROR, + CD_CLIENT_ERROR_INTERNAL, + "Failed to copy: %s", + error->message); + g_object_unref (task); } } @@ -1090,48 +1028,48 @@ GAsyncResult *res, gpointer user_data) { - CdClientImportHelper *helper = (CdClientImportHelper *) user_data; + GTask *task = G_TASK (user_data); + CdClient *client = CD_CLIENT (g_task_get_source_object (task)); + CdClientImportTaskData *tdata = g_task_get_task_data (task); const gchar *type; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *filename = NULL; - _cleanup_object_unref_ GFileInfo *info = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *filename = NULL; + g_autoptr(GFileInfo) info = NULL; /* get the file info */ - filename = g_file_get_path (helper->dest); + filename = g_file_get_path (tdata->dest); info = g_file_query_info_finish (G_FILE (source_object), res, &error); if (info == NULL) { - g_simple_async_result_set_error (helper->res, - CD_CLIENT_ERROR, - CD_CLIENT_ERROR_INTERNAL, - "Cannot get content type for %s: %s", - filename, - error->message); - g_simple_async_result_complete_in_idle (helper->res); - cd_client_import_free_helper (helper); + g_task_return_new_error (task, + CD_CLIENT_ERROR, + CD_CLIENT_ERROR_INTERNAL, + "Cannot get content type for %s: %s", + filename, + error->message); + g_object_unref (task); return; } /* check the content type */ type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); if (g_strcmp0 (type, "application/vnd.iccprofile") != 0) { - g_simple_async_result_set_error (helper->res, - CD_CLIENT_ERROR, - CD_CLIENT_ERROR_FILE_INVALID, - "Incorrect content type for %s, got %s", - filename, type); - g_simple_async_result_complete_in_idle (helper->res); - cd_client_import_free_helper (helper); + g_task_return_new_error (task, + CD_CLIENT_ERROR, + CD_CLIENT_ERROR_FILE_INVALID, + "Incorrect content type for %s, got %s", + filename, type); + g_object_unref (task); return; } /* does this profile already exist? */ - cd_client_find_profile_by_filename (helper->client, + cd_client_find_profile_by_filename (client, filename, - helper->cancellable, + g_task_get_cancellable (task), cd_client_import_profile_find_filename_cb, - helper); + task); } /** @@ -1156,31 +1094,27 @@ GAsyncReadyCallback callback, gpointer user_data) { - CdClientImportHelper *helper; + CdClientImportTaskData *tdata; + GTask *task; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (G_IS_FILE (file)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - helper = g_new0 (CdClientImportHelper, 1); - helper->client = g_object_ref (client); - helper->res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_import_profile); - helper->file = g_object_ref (file); - helper->dest = cd_client_import_get_profile_destination (file); - if (cancellable != NULL) - helper->cancellable = g_object_ref (cancellable); + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + tdata = g_new0 (CdClientImportTaskData, 1); + tdata->file = g_object_ref (file); + tdata->dest = cd_client_import_get_profile_destination (file); + g_task_set_task_data (task, tdata, (GDestroyNotify) cd_client_import_task_data_free); /* check the file really is an ICC file */ - g_file_query_info_async (helper->file, + g_file_query_info_async (tdata->file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, - helper->cancellable, + cancellable, cd_client_import_profile_query_info_cb, - helper); + task); } /**********************************************************************/ @@ -1202,17 +1136,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, client), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -1220,23 +1145,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1258,18 +1182,16 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_delete_device); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "DeleteDevice", g_variant_new ("(o)", cd_device_get_object_path (device)), @@ -1277,7 +1199,7 @@ -1, cancellable, cd_client_delete_device_cb, - res); + task); } /**********************************************************************/ @@ -1299,17 +1221,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, client), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -1317,23 +1230,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1355,18 +1267,16 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (CD_IS_PROFILE (profile)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_delete_profile); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "DeleteProfile", g_variant_new ("(o)", cd_profile_get_object_path (profile)), @@ -1374,7 +1284,7 @@ -1, cancellable, cd_client_delete_profile_cb, - res); + task); } /**********************************************************************/ @@ -1396,17 +1306,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1415,32 +1316,28 @@ gpointer user_data) { CdDevice *device; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create a device object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); device = cd_device_new (); cd_device_set_object_path (device, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - device, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, device, (GDestroyNotify) g_object_unref); } /** @@ -1462,25 +1359,23 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (id != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_find_device); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "FindDeviceById", g_variant_new ("(s)", id), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_find_device_cb, - res); + task); } /**********************************************************************/ @@ -1502,17 +1397,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1521,32 +1407,28 @@ gpointer user_data) { CdDevice *device; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create a device object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); device = cd_device_new (); cd_device_set_object_path (device, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - device, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, device, (GDestroyNotify) g_object_unref); } /** @@ -1570,25 +1452,23 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (key != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_find_device_by_property); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "FindDeviceByProperty", g_variant_new ("(ss)", key, value), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_find_device_by_property_cb, - res); + task); } /**********************************************************************/ @@ -1610,17 +1490,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1629,32 +1500,28 @@ gpointer user_data) { CdProfile *profile; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create a profile object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); profile = cd_profile_new (); cd_profile_set_object_path (profile, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - profile, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, profile, (GDestroyNotify) g_object_unref); } /** @@ -1676,25 +1543,23 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (id != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_find_profile); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "FindProfileById", g_variant_new ("(s)", id), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_find_profile_cb, - res); + task); } /**********************************************************************/ @@ -1716,17 +1581,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1735,32 +1591,28 @@ gpointer user_data) { CdProfile *profile; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create a profile object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); profile = cd_profile_new (); cd_profile_set_object_path (profile, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - profile, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, profile, (GDestroyNotify) g_object_unref); } /** @@ -1782,25 +1634,23 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (filename != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_find_profile_by_filename); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "FindProfileByFilename", g_variant_new ("(s)", filename), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_find_profile_by_filename_cb, - res); + task); } /**********************************************************************/ @@ -1822,17 +1672,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1841,32 +1682,28 @@ gpointer user_data) { CdProfile *profile; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create a profile object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); profile = cd_profile_new (); cd_profile_set_object_path (profile, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - profile, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, profile, (GDestroyNotify) g_object_unref); } /** @@ -1888,17 +1725,15 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_get_standard_space); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "GetStandardSpace", g_variant_new ("(s)", cd_standard_space_to_string (standard_space)), @@ -1906,7 +1741,7 @@ -1, cancellable, cd_client_get_standard_space_cb, - res); + task); } /**********************************************************************/ @@ -1923,14 +1758,14 @@ GVariantIter iter; guint i; guint len; - _cleanup_variant_unref_ GVariant *child = NULL; + g_autoptr(GVariant) child = NULL; /* add each device */ array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); child = g_variant_get_child_value (result, 0); len = g_variant_iter_init (&iter, child); for (i = 0; i < len; i++) { - _cleanup_free_ gchar *object_path_tmp = NULL; + g_autofree gchar *object_path_tmp = NULL; g_variant_get_child (child, i, "o", &object_path_tmp); device = cd_device_new_with_object_path (object_path_tmp); @@ -1956,17 +1791,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_ptr_array_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1976,19 +1802,19 @@ { CdClient *client; GPtrArray *array; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; - client = CD_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (res_source))); + client = CD_CLIENT (g_task_get_source_object (task)); result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } @@ -1996,10 +1822,7 @@ array = cd_client_get_device_array_from_variant (client, result); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - array, - (GDestroyNotify) g_ptr_array_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, array, (GDestroyNotify) g_ptr_array_unref); } /** @@ -2019,24 +1842,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_get_devices); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "GetDevices", NULL, G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_get_devices_cb, - res); + task); } /**********************************************************************/ @@ -2058,17 +1879,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_ptr_array_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -2078,19 +1890,19 @@ { CdClient *client; GPtrArray *array; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; - client = CD_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (res_source))); + client = CD_CLIENT (g_task_get_source_object (task)); result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } @@ -2098,10 +1910,7 @@ array = cd_client_get_device_array_from_variant (client, result); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - array, - (GDestroyNotify) g_ptr_array_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, array, (GDestroyNotify) g_ptr_array_unref); } /** @@ -2123,17 +1932,15 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_get_devices_by_kind); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "GetDevicesByKind", g_variant_new ("(s)", cd_device_kind_to_string (kind)), @@ -2141,7 +1948,7 @@ -1, cancellable, cd_client_get_devices_by_kind_cb, - res); + task); } /**********************************************************************/ @@ -2158,14 +1965,14 @@ GVariantIter iter; guint i; guint len; - _cleanup_variant_unref_ GVariant *child = NULL; + g_autoptr(GVariant) child = NULL; /* add each profile */ array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); child = g_variant_get_child_value (result, 0); len = g_variant_iter_init (&iter, child); for (i = 0; i < len; i++) { - _cleanup_free_ gchar *object_path_tmp = NULL; + g_autofree gchar *object_path_tmp = NULL; g_variant_get_child (child, i, "o", &object_path_tmp); profile = cd_profile_new_with_object_path (object_path_tmp); @@ -2191,17 +1998,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_ptr_array_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -2211,19 +2009,19 @@ { CdClient *client; GPtrArray *array; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; - client = CD_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (res_source))); + client = CD_CLIENT (g_task_get_source_object (task)); result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } @@ -2231,10 +2029,7 @@ array = cd_client_get_profile_array_from_variant (client, result); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - array, - (GDestroyNotify) g_ptr_array_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, array, (GDestroyNotify) g_ptr_array_unref); } /** @@ -2254,24 +2049,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_get_profiles); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "GetProfiles", NULL, G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_get_profiles_cb, - res); + task); } /**********************************************************************/ @@ -2288,14 +2081,14 @@ GVariantIter iter; guint i; guint len; - _cleanup_variant_unref_ GVariant *child = NULL; + g_autoptr(GVariant) child = NULL; /* add each sensor */ array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); child = g_variant_get_child_value (result, 0); len = g_variant_iter_init (&iter, child); for (i = 0; i < len; i++) { - _cleanup_free_ gchar *object_path_tmp = NULL; + g_autofree gchar *object_path_tmp = NULL; g_variant_get_child (child, i, "o", &object_path_tmp); sensor = cd_sensor_new_with_object_path (object_path_tmp); @@ -2321,17 +2114,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_ptr_array_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -2339,21 +2123,21 @@ GAsyncResult *res, gpointer user_data) { - CdClient *client; GPtrArray *array; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; + CdClient *client = CD_CLIENT (g_task_get_source_object (task)); - client = CD_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (res_source))); + client = CD_CLIENT (g_task_get_source_object (task)); result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } @@ -2361,10 +2145,7 @@ array = cd_client_get_sensor_array_from_variant (client, result); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - array, - (GDestroyNotify) g_ptr_array_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, array, (GDestroyNotify) g_ptr_array_unref); } /** @@ -2384,24 +2165,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_get_sensors); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "GetSensors", NULL, G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_get_sensors_cb, - res); + task); } /**********************************************************************/ @@ -2423,17 +2202,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -2442,32 +2212,28 @@ gpointer user_data) { CdProfile *profile; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create a profile object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); profile = cd_profile_new (); cd_profile_set_object_path (profile, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - profile, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, profile, (GDestroyNotify) g_object_unref); } /** @@ -2491,25 +2257,23 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (key != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_find_profile_by_property); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "FindProfileByProperty", g_variant_new ("(ss)", key, value), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_find_profile_by_property_cb, - res); + task); } /**********************************************************************/ @@ -2531,17 +2295,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_CLIENT (client), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, client), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -2550,32 +2305,28 @@ gpointer user_data) { CdSensor *sensor; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *object_path = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_client_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create a sensor object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); sensor = cd_sensor_new (); cd_sensor_set_object_path (sensor, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - sensor, - (GDestroyNotify) g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, sensor, (GDestroyNotify) g_object_unref); } /** @@ -2597,25 +2348,23 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdClientPrivate *priv = GET_PRIVATE (client); + GTask *task = NULL; g_return_if_fail (CD_IS_CLIENT (client)); g_return_if_fail (id != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (client->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (client), - callback, - user_data, - cd_client_find_sensor); - g_dbus_proxy_call (client->priv->proxy, + task = g_task_new (G_OBJECT (client), cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "FindSensorById", g_variant_new ("(s)", id), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_client_find_sensor_cb, - res); + task); } /**********************************************************************/ @@ -2625,24 +2374,25 @@ */ static void cd_client_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { CdClient *client = CD_CLIENT (object); + CdClientPrivate *priv = GET_PRIVATE (client); switch (prop_id) { case PROP_DAEMON_VERSION: - g_value_set_string (value, client->priv->daemon_version); + g_value_set_string (value, priv->daemon_version); break; case PROP_SYSTEM_VENDOR: - g_value_set_string (value, client->priv->system_vendor); + g_value_set_string (value, priv->system_vendor); break; case PROP_SYSTEM_MODEL: - g_value_set_string (value, client->priv->system_model); + g_value_set_string (value, priv->system_model); break; case PROP_CONNECTED: - g_value_set_boolean (value, client->priv->proxy != NULL); + g_value_set_boolean (value, priv->proxy != NULL); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -2871,8 +2621,6 @@ G_STRUCT_OFFSET (CdClientClass, changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - g_type_class_add_private (klass, sizeof (CdClientPrivate)); } /* @@ -2881,8 +2629,6 @@ static void cd_client_init (CdClient *client) { - client->priv = CD_CLIENT_GET_PRIVATE (client); - /* ensure the remote errors are registered */ cd_client_error_quark (); } @@ -2894,14 +2640,15 @@ cd_client_finalize (GObject *object) { CdClient *client = CD_CLIENT (object); + CdClientPrivate *priv = GET_PRIVATE (client); g_return_if_fail (CD_IS_CLIENT (object)); - g_free (client->priv->daemon_version); - g_free (client->priv->system_vendor); - g_free (client->priv->system_model); - if (client->priv->proxy != NULL) - g_object_unref (client->priv->proxy); + g_free (priv->daemon_version); + g_free (priv->system_vendor); + g_free (priv->system_model); + if (priv->proxy != NULL) + g_object_unref (priv->proxy); G_OBJECT_CLASS (cd_client_parent_class)->finalize (object); } diff -Nru colord-1.2.12/lib/colord/cd-client.h colord-1.3.2/lib/colord/cd-client.h --- colord-1.2.12/lib/colord/cd-client.h 2015-05-01 13:55:26.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-client.h 2015-10-13 15:24:13.000000000 +0000 @@ -35,24 +35,13 @@ G_BEGIN_DECLS -#define CD_TYPE_CLIENT (cd_client_get_type ()) -#define CD_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_CLIENT, CdClient)) -#define CD_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_CLIENT, CdClientClass)) -#define CD_IS_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_CLIENT)) -#define CD_IS_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_CLIENT)) -#define CD_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_CLIENT, CdClientClass)) #define CD_CLIENT_ERROR (cd_client_error_quark ()) #define CD_CLIENT_TYPE_ERROR (cd_client_error_get_type ()) -typedef struct _CdClientPrivate CdClientPrivate; +#define CD_TYPE_CLIENT (cd_client_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdClient, cd_client, CD, CLIENT, GObject) -typedef struct -{ - GObject parent; - CdClientPrivate *priv; -} CdClient; - -typedef struct +struct _CdClientClass { GObjectClass parent_class; void (*device_added) (CdClient *client, @@ -84,9 +73,8 @@ void (*_cd_client_reserved6) (void); void (*_cd_client_reserved7) (void); void (*_cd_client_reserved8) (void); -} CdClientClass; +}; -GType cd_client_get_type (void); GQuark cd_client_error_quark (void); CdClient *cd_client_new (void); diff -Nru colord-1.2.12/lib/colord/cd-color.h colord-1.3.2/lib/colord/cd-color.h --- colord-1.2.12/lib/colord/cd-color.h 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-color.h 2015-10-13 15:26:52.000000000 +0000 @@ -100,6 +100,13 @@ void cd_color_uvw_free (CdColorUVW *src); void cd_color_swatch_free (CdColorSwatch *src); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(CdColorXYZ, cd_color_xyz_free) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(CdColorRGB, cd_color_rgb_free) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(CdColorLab, cd_color_lab_free) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(CdColorYxy, cd_color_yxy_free) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(CdColorUVW, cd_color_uvw_free) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(CdColorSwatch, cd_color_swatch_free) + CdColorXYZ *cd_color_xyz_dup (const CdColorXYZ *src); CdColorLab *cd_color_lab_dup (const CdColorLab *src); CdColorRGB *cd_color_rgb_dup (const CdColorRGB *src); diff -Nru colord-1.2.12/lib/colord/cd-device.c colord-1.3.2/lib/colord/cd-device.c --- colord-1.2.12/lib/colord/cd-device.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-device.c 2016-03-15 12:25:50.000000000 +0000 @@ -36,7 +36,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-device.h" #include "cd-profile.h" #include "cd-profile-sync.h" @@ -45,7 +44,7 @@ static void cd_device_init (CdDevice *device); static void cd_device_finalize (GObject *object); -#define CD_DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_DEVICE, CdDevicePrivate)) +#define GET_PRIVATE(o) (cd_device_get_instance_private (o)) #define COLORD_DBUS_SERVICE "org.freedesktop.ColorManager" #define COLORD_DBUS_INTERFACE_DEVICE "org.freedesktop.ColorManager.Device" @@ -55,7 +54,7 @@ * * Private #CdDevice data **/ -struct _CdDevicePrivate +typedef struct { GDBusProxy *proxy; gchar *object_path; @@ -77,7 +76,7 @@ gboolean embedded; guint owner; GHashTable *metadata; -}; +} CdDevicePrivate; enum { PROP_0, @@ -109,7 +108,7 @@ static guint signals [SIGNAL_LAST] = { 0 }; -G_DEFINE_TYPE (CdDevice, cd_device, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdDevice, cd_device, G_TYPE_OBJECT) /** * cd_device_error_quark: @@ -139,9 +138,10 @@ void cd_device_set_object_path (CdDevice *device, const gchar *object_path) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_if_fail (CD_IS_DEVICE (device)); - g_return_if_fail (device->priv->object_path == NULL); - device->priv->object_path = g_strdup (object_path); + g_return_if_fail (priv->object_path == NULL); + priv->object_path = g_strdup (object_path); } /** @@ -157,9 +157,10 @@ const gchar * cd_device_get_id (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return device->priv->id; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->id; } /** @@ -175,9 +176,10 @@ const gchar * cd_device_get_model (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return device->priv->model; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->model; } /** @@ -193,9 +195,10 @@ const gchar * cd_device_get_vendor (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return device->priv->vendor; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->vendor; } /** @@ -211,9 +214,10 @@ const gchar * cd_device_get_serial (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return device->priv->serial; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->serial; } /** @@ -229,9 +233,10 @@ const gchar * cd_device_get_seat (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return device->priv->seat; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->seat; } /** @@ -247,9 +252,10 @@ const gchar * cd_device_get_format (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return device->priv->format; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->format; } /** @@ -265,9 +271,10 @@ const gchar ** cd_device_get_profiling_inhibitors (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return (const gchar **) device->priv->profiling_inhibitors; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return (const gchar **) priv->profiling_inhibitors; } /** @@ -283,9 +290,10 @@ guint64 cd_device_get_created (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), 0); - g_return_val_if_fail (device->priv->proxy != NULL, 0); - return device->priv->created; + g_return_val_if_fail (priv->proxy != NULL, 0); + return priv->created; } /** @@ -301,9 +309,10 @@ guint64 cd_device_get_modified (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), 0); - g_return_val_if_fail (device->priv->proxy != NULL, 0); - return device->priv->modified; + g_return_val_if_fail (priv->proxy != NULL, 0); + return priv->modified; } /** @@ -319,9 +328,10 @@ CdDeviceKind cd_device_get_kind (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), CD_DEVICE_KIND_UNKNOWN); - g_return_val_if_fail (device->priv->proxy != NULL, CD_DEVICE_KIND_UNKNOWN); - return device->priv->kind; + g_return_val_if_fail (priv->proxy != NULL, CD_DEVICE_KIND_UNKNOWN); + return priv->kind; } /** @@ -337,9 +347,10 @@ CdColorspace cd_device_get_colorspace (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), CD_COLORSPACE_UNKNOWN); - g_return_val_if_fail (device->priv->proxy != NULL, CD_COLORSPACE_UNKNOWN); - return device->priv->colorspace; + g_return_val_if_fail (priv->proxy != NULL, CD_COLORSPACE_UNKNOWN); + return priv->colorspace; } /** @@ -355,9 +366,10 @@ CdDeviceMode cd_device_get_mode (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), CD_DEVICE_MODE_UNKNOWN); - g_return_val_if_fail (device->priv->proxy != NULL, CD_DEVICE_MODE_UNKNOWN); - return device->priv->mode; + g_return_val_if_fail (priv->proxy != NULL, CD_DEVICE_MODE_UNKNOWN); + return priv->mode; } /** @@ -373,9 +385,10 @@ gboolean cd_device_get_enabled (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (device->priv->proxy != NULL, FALSE); - return device->priv->enabled; + g_return_val_if_fail (priv->proxy != NULL, FALSE); + return priv->enabled; } /** @@ -392,9 +405,10 @@ gboolean cd_device_get_embedded (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (device->priv->proxy != NULL, FALSE); - return device->priv->embedded; + g_return_val_if_fail (priv->proxy != NULL, FALSE); + return priv->embedded; } /** @@ -410,9 +424,10 @@ CdObjectScope cd_device_get_scope (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), CD_OBJECT_SCOPE_UNKNOWN); - g_return_val_if_fail (device->priv->proxy != NULL, CD_OBJECT_SCOPE_UNKNOWN); - return device->priv->scope; + g_return_val_if_fail (priv->proxy != NULL, CD_OBJECT_SCOPE_UNKNOWN); + return priv->scope; } /** @@ -428,9 +443,10 @@ guint cd_device_get_owner (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), G_MAXUINT); - g_return_val_if_fail (device->priv->proxy != NULL, G_MAXUINT); - return device->priv->owner; + g_return_val_if_fail (priv->proxy != NULL, G_MAXUINT); + return priv->owner; } /** @@ -446,11 +462,12 @@ GPtrArray * cd_device_get_profiles (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - if (device->priv->profiles == NULL) + g_return_val_if_fail (priv->proxy != NULL, NULL); + if (priv->profiles == NULL) return NULL; - return g_ptr_array_ref (device->priv->profiles); + return g_ptr_array_ref (priv->profiles); } /** @@ -467,17 +484,18 @@ CdProfile * cd_device_get_default_profile (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - if (device->priv->profiles == NULL) + g_return_val_if_fail (priv->proxy != NULL, NULL); + if (priv->profiles == NULL) return NULL; - if (device->priv->profiles->len == 0) + if (priv->profiles->len == 0) return NULL; - if (!device->priv->enabled) + if (!priv->enabled) return NULL; - if (g_strv_length (device->priv->profiling_inhibitors) > 0) + if (g_strv_length (priv->profiling_inhibitors) > 0) return NULL; - return g_object_ref (g_ptr_array_index (device->priv->profiles, 0)); + return g_object_ref (g_ptr_array_index (priv->profiles, 0)); } /** @@ -487,20 +505,21 @@ cd_device_set_profiles_array_from_variant (CdDevice *device, GVariant *profiles) { + CdDevicePrivate *priv = GET_PRIVATE (device); CdProfile *profile_tmp; gsize len; guint i; - g_ptr_array_set_size (device->priv->profiles, 0); + g_ptr_array_set_size (priv->profiles, 0); if (profiles == NULL) return; len = g_variant_n_children (profiles); for (i = 0; i < len; i++) { - _cleanup_free_ gchar *object_path_tmp = NULL; + g_autofree gchar *object_path_tmp = NULL; g_variant_get_child (profiles, i, "o", &object_path_tmp); profile_tmp = cd_profile_new_with_object_path (object_path_tmp); - g_ptr_array_add (device->priv->profiles, profile_tmp); + g_ptr_array_add (priv->profiles, profile_tmp); } } @@ -518,9 +537,10 @@ GHashTable * cd_device_get_metadata (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return g_hash_table_ref (device->priv->metadata); + g_return_val_if_fail (priv->proxy != NULL, NULL); + return g_hash_table_ref (priv->metadata); } /** @@ -537,9 +557,10 @@ const gchar * cd_device_get_metadata_item (CdDevice *device, const gchar *key) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (device->priv->proxy != NULL, NULL); - return g_hash_table_lookup (device->priv->metadata, key); + g_return_val_if_fail (priv->proxy != NULL, NULL); + return g_hash_table_lookup (priv->metadata, key); } /** @@ -548,18 +569,19 @@ static void cd_device_set_metadata_from_variant (CdDevice *device, GVariant *variant) { + CdDevicePrivate *priv = GET_PRIVATE (device); GVariantIter iter; const gchar *prop_key; const gchar *prop_value; /* remove old entries */ - g_hash_table_remove_all (device->priv->metadata); + g_hash_table_remove_all (priv->metadata); /* insert the new metadata */ g_variant_iter_init (&iter, variant); while (g_variant_iter_loop (&iter, "{ss}", &prop_key, &prop_value)) { - g_hash_table_insert (device->priv->metadata, + g_hash_table_insert (priv->metadata, g_strdup (prop_key), g_strdup (prop_value)); @@ -592,6 +614,7 @@ const gchar * const *invalidated_properties, CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); guint i; guint len; GVariantIter iter; @@ -607,49 +630,49 @@ &property_name, &property_value); if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_MODEL) == 0) { - g_free (device->priv->model); - device->priv->model = cd_device_get_nullable_str (property_value); + g_free (priv->model); + priv->model = cd_device_get_nullable_str (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_SERIAL) == 0) { - g_free (device->priv->serial); - device->priv->serial = cd_device_get_nullable_str (property_value); + g_free (priv->serial); + priv->serial = cd_device_get_nullable_str (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_SEAT) == 0) { - g_free (device->priv->seat); - device->priv->seat = cd_device_get_nullable_str (property_value); + g_free (priv->seat); + priv->seat = cd_device_get_nullable_str (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_FORMAT) == 0) { - g_free (device->priv->format); - device->priv->format = cd_device_get_nullable_str (property_value); + g_free (priv->format); + priv->format = cd_device_get_nullable_str (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_VENDOR) == 0) { - g_free (device->priv->vendor); - device->priv->vendor = cd_device_get_nullable_str (property_value); + g_free (priv->vendor); + priv->vendor = cd_device_get_nullable_str (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_PROFILING_INHIBITORS) == 0) { - g_free (device->priv->profiling_inhibitors); - device->priv->profiling_inhibitors = g_variant_dup_strv (property_value, NULL); + g_free (priv->profiling_inhibitors); + priv->profiling_inhibitors = g_variant_dup_strv (property_value, NULL); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_KIND) == 0) { - device->priv->kind = + priv->kind = cd_device_kind_from_string (g_variant_get_string (property_value, NULL)); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_COLORSPACE) == 0) { - device->priv->colorspace = + priv->colorspace = cd_colorspace_from_string (g_variant_get_string (property_value, NULL)); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_MODE) == 0) { - device->priv->mode = + priv->mode = cd_device_mode_from_string (g_variant_get_string (property_value, NULL)); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_PROFILES) == 0) { cd_device_set_profiles_array_from_variant (device, property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_CREATED) == 0) { - device->priv->created = g_variant_get_uint64 (property_value); + priv->created = g_variant_get_uint64 (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_ENABLED) == 0) { - device->priv->enabled = g_variant_get_boolean (property_value); + priv->enabled = g_variant_get_boolean (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_EMBEDDED) == 0) { - device->priv->embedded = g_variant_get_boolean (property_value); + priv->embedded = g_variant_get_boolean (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_MODIFIED) == 0) { - device->priv->modified = g_variant_get_uint64 (property_value); + priv->modified = g_variant_get_uint64 (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_METADATA) == 0) { cd_device_set_metadata_from_variant (device, property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_OWNER) == 0) { - device->priv->owner = g_variant_get_uint32 (property_value); + priv->owner = g_variant_get_uint32 (property_value); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_SCOPE) == 0) { - device->priv->scope = cd_object_scope_from_string (g_variant_get_string (property_value, NULL)); + priv->scope = cd_object_scope_from_string (g_variant_get_string (property_value, NULL)); } else if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_ID) == 0) { /* ignore this, we don't support it changing */; } else { @@ -701,17 +724,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -720,178 +734,176 @@ gpointer user_data) { CdDevice *device; - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *colorspace = NULL; - _cleanup_variant_unref_ GVariant *created = NULL; - _cleanup_variant_unref_ GVariant *embedded = NULL; - _cleanup_variant_unref_ GVariant *enabled = NULL; - _cleanup_variant_unref_ GVariant *format = NULL; - _cleanup_variant_unref_ GVariant *id = NULL; - _cleanup_variant_unref_ GVariant *kind = NULL; - _cleanup_variant_unref_ GVariant *metadata = NULL; - _cleanup_variant_unref_ GVariant *model = NULL; - _cleanup_variant_unref_ GVariant *mode = NULL; - _cleanup_variant_unref_ GVariant *modified = NULL; - _cleanup_variant_unref_ GVariant *owner = NULL; - _cleanup_variant_unref_ GVariant *profiles = NULL; - _cleanup_variant_unref_ GVariant *profiling_inhibitors = NULL; - _cleanup_variant_unref_ GVariant *scope = NULL; - _cleanup_variant_unref_ GVariant *seat = NULL; - _cleanup_variant_unref_ GVariant *serial = NULL; - _cleanup_variant_unref_ GVariant *vendor = NULL; - - device = CD_DEVICE (g_async_result_get_source_object (G_ASYNC_RESULT (user_data))); - device->priv->proxy = g_dbus_proxy_new_for_bus_finish (res, - &error); - if (device->priv->proxy == NULL) { - g_simple_async_result_set_error (res_source, - CD_DEVICE_ERROR, - CD_DEVICE_ERROR_INTERNAL, - "Failed to connect to device %s: %s", - cd_device_get_object_path (device), - error->message); - g_simple_async_result_complete_in_idle (res_source); + CdDevicePrivate *priv; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) colorspace = NULL; + g_autoptr(GVariant) created = NULL; + g_autoptr(GVariant) embedded = NULL; + g_autoptr(GVariant) enabled = NULL; + g_autoptr(GVariant) format = NULL; + g_autoptr(GVariant) id = NULL; + g_autoptr(GVariant) kind = NULL; + g_autoptr(GVariant) metadata = NULL; + g_autoptr(GVariant) model = NULL; + g_autoptr(GVariant) mode = NULL; + g_autoptr(GVariant) modified = NULL; + g_autoptr(GVariant) owner = NULL; + g_autoptr(GVariant) profiles = NULL; + g_autoptr(GVariant) profiling_inhibitors = NULL; + g_autoptr(GVariant) scope = NULL; + g_autoptr(GVariant) seat = NULL; + g_autoptr(GVariant) serial = NULL; + g_autoptr(GVariant) vendor = NULL; + + device = CD_DEVICE (g_task_get_source_object (task)); + priv = GET_PRIVATE (device); + priv->proxy = g_dbus_proxy_new_for_bus_finish (res, &error); + if (priv->proxy == NULL) { + g_task_return_new_error (task, + CD_DEVICE_ERROR, + CD_DEVICE_ERROR_INTERNAL, + "Failed to connect to device %s: %s", + cd_device_get_object_path (device), + error->message); return; } /* get device id */ - id = g_dbus_proxy_get_cached_property (device->priv->proxy, + id = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_ID); if (id != NULL) - device->priv->id = cd_device_get_nullable_str (id); + priv->id = cd_device_get_nullable_str (id); /* if the device is missing, then fail */ if (id == NULL) { - g_simple_async_result_set_error (res_source, - CD_DEVICE_ERROR, - CD_DEVICE_ERROR_INTERNAL, - "Failed to connect to missing device %s", - cd_device_get_object_path (device)); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_new_error (task, + CD_DEVICE_ERROR, + CD_DEVICE_ERROR_INTERNAL, + "Failed to connect to missing device %s", + cd_device_get_object_path (device)); return; } /* get kind */ - kind = g_dbus_proxy_get_cached_property (device->priv->proxy, + kind = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_KIND); if (kind != NULL) - device->priv->kind = + priv->kind = cd_device_kind_from_string (g_variant_get_string (kind, NULL)); /* get colorspace */ - colorspace = g_dbus_proxy_get_cached_property (device->priv->proxy, + colorspace = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_COLORSPACE); if (colorspace != NULL) - device->priv->colorspace = + priv->colorspace = cd_colorspace_from_string (g_variant_get_string (colorspace, NULL)); /* get scope */ - scope = g_dbus_proxy_get_cached_property (device->priv->proxy, + scope = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_SCOPE); if (scope != NULL) - device->priv->scope = + priv->scope = cd_object_scope_from_string (g_variant_get_string (scope, NULL)); /* get enabled */ - enabled = g_dbus_proxy_get_cached_property (device->priv->proxy, + enabled = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_ENABLED); if (enabled != NULL) - device->priv->enabled = g_variant_get_boolean (enabled); + priv->enabled = g_variant_get_boolean (enabled); /* get owner */ - owner = g_dbus_proxy_get_cached_property (device->priv->proxy, + owner = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_OWNER); if (owner != NULL) - device->priv->owner = g_variant_get_uint32 (owner); + priv->owner = g_variant_get_uint32 (owner); /* get mode */ - mode = g_dbus_proxy_get_cached_property (device->priv->proxy, + mode = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_MODE); if (mode != NULL) - device->priv->mode = + priv->mode = cd_device_mode_from_string (g_variant_get_string (mode, NULL)); /* get model */ - model = g_dbus_proxy_get_cached_property (device->priv->proxy, + model = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_MODEL); if (model != NULL) - device->priv->model = cd_device_get_nullable_str (model); + priv->model = cd_device_get_nullable_str (model); /* get serial */ - serial = g_dbus_proxy_get_cached_property (device->priv->proxy, + serial = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_SERIAL); if (serial != NULL) - device->priv->serial = cd_device_get_nullable_str (serial); + priv->serial = cd_device_get_nullable_str (serial); /* get seat */ - seat = g_dbus_proxy_get_cached_property (device->priv->proxy, + seat = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_SEAT); if (seat != NULL) - device->priv->seat = cd_device_get_nullable_str (seat); + priv->seat = cd_device_get_nullable_str (seat); /* get format */ - format = g_dbus_proxy_get_cached_property (device->priv->proxy, + format = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_FORMAT); if (format != NULL) - device->priv->format = cd_device_get_nullable_str (format); + priv->format = cd_device_get_nullable_str (format); /* get vendor */ - vendor = g_dbus_proxy_get_cached_property (device->priv->proxy, + vendor = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_VENDOR); if (vendor != NULL) - device->priv->vendor = cd_device_get_nullable_str (vendor); + priv->vendor = cd_device_get_nullable_str (vendor); /* get profiling inhibitors */ - profiling_inhibitors = g_dbus_proxy_get_cached_property (device->priv->proxy, + profiling_inhibitors = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_PROFILING_INHIBITORS); if (profiling_inhibitors != NULL) - device->priv->profiling_inhibitors = g_variant_dup_strv (profiling_inhibitors, NULL); + priv->profiling_inhibitors = g_variant_dup_strv (profiling_inhibitors, NULL); /* get created */ - created = g_dbus_proxy_get_cached_property (device->priv->proxy, + created = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_CREATED); if (created != NULL) - device->priv->created = g_variant_get_uint64 (created); + priv->created = g_variant_get_uint64 (created); /* get modified */ - modified = g_dbus_proxy_get_cached_property (device->priv->proxy, + modified = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_MODIFIED); if (modified != NULL) - device->priv->modified = g_variant_get_uint64 (modified); + priv->modified = g_variant_get_uint64 (modified); /* get profiles */ - profiles = g_dbus_proxy_get_cached_property (device->priv->proxy, + profiles = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_PROFILES); cd_device_set_profiles_array_from_variant (device, profiles); /* get embedded */ - embedded = g_dbus_proxy_get_cached_property (device->priv->proxy, + embedded = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_EMBEDDED); if (embedded != NULL) - device->priv->embedded = g_variant_get_boolean (embedded); + priv->embedded = g_variant_get_boolean (embedded); /* get metadata */ - metadata = g_dbus_proxy_get_cached_property (device->priv->proxy, + metadata = g_dbus_proxy_get_cached_property (priv->proxy, CD_DEVICE_PROPERTY_METADATA); if (metadata != NULL) cd_device_set_metadata_from_variant (device, metadata); /* get signals from DBus */ - g_signal_connect (device->priv->proxy, - "g-signal", - G_CALLBACK (cd_device_dbus_signal_cb), - device); + g_signal_connect_object (priv->proxy, + "g-signal", + G_CALLBACK (cd_device_dbus_signal_cb), + device, 0); /* watch if any remote properties change */ - g_signal_connect (device->priv->proxy, - "g-properties-changed", - G_CALLBACK (cd_device_dbus_properties_changed_cb), - device); + g_signal_connect_object (priv->proxy, + "g-properties-changed", + G_CALLBACK (cd_device_dbus_properties_changed_cb), + device, 0); /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -911,20 +923,17 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_connect); + task = g_task_new (device, cancellable, callback, user_data); /* already connected */ - if (device->priv->proxy != NULL) { - g_simple_async_result_set_op_res_gboolean (res, TRUE); - g_simple_async_result_complete_in_idle (res); + if (priv->proxy != NULL) { + g_task_return_boolean (task, TRUE); return; } @@ -932,11 +941,11 @@ G_DBUS_PROXY_FLAGS_NONE, NULL, COLORD_DBUS_SERVICE, - device->priv->object_path, + priv->object_path, COLORD_DBUS_INTERFACE_DEVICE, cancellable, cd_device_connect_cb, - res); + task); } /**********************************************************************/ @@ -958,17 +967,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } /** @@ -977,7 +977,7 @@ static void cd_device_fixup_dbus_error (GError *error) { - _cleanup_free_ gchar *name = NULL; + g_autofree gchar *name = NULL; g_return_if_fail (error != NULL); @@ -997,23 +997,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1037,19 +1036,17 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (key != NULL); g_return_if_fail (value != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_set_property); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "SetProperty", g_variant_new ("(ss)", key, value), @@ -1057,7 +1054,7 @@ -1, cancellable, cd_device_set_property_cb, - res); + task); } /**********************************************************************/ @@ -1079,17 +1076,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -1097,23 +1085,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1137,18 +1124,16 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (CD_IS_PROFILE (profile)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_add_profile); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "AddProfile", g_variant_new ("(so)", cd_device_relation_to_string (relation), @@ -1157,7 +1142,7 @@ -1, cancellable, cd_device_add_profile_cb, - res); + task); } /**********************************************************************/ @@ -1179,17 +1164,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -1197,23 +1173,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1235,18 +1210,16 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (CD_IS_PROFILE (profile)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_remove_profile); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "RemoveProfile", g_variant_new ("(o)", cd_profile_get_object_path (profile)), @@ -1254,7 +1227,7 @@ -1, cancellable, cd_device_remove_profile_cb, - res); + task); } /**********************************************************************/ @@ -1276,17 +1249,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -1294,23 +1258,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1332,18 +1295,16 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (CD_IS_PROFILE (profile)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_make_profile_default); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "MakeProfileDefault", g_variant_new ("(o)", cd_profile_get_object_path (profile)), @@ -1351,7 +1312,7 @@ -1, cancellable, cd_device_make_profile_default_cb, - res); + task); } /**********************************************************************/ @@ -1373,17 +1334,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -1391,23 +1343,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1428,24 +1379,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_profiling_inhibit); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "ProfilingInhibit", NULL, G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_device_profiling_inhibit_cb, - res); + task); } /**********************************************************************/ @@ -1467,17 +1416,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -1485,23 +1425,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_variant_unref_ GVariant *result = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); + g_autoptr(GError) error = NULL; + g_autoptr(GVariant) result = NULL; + g_autoptr(GTask) task = G_TASK (user_data); result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1522,24 +1461,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_profiling_uninhibit); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "ProfilingUninhibit", NULL, G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_device_profiling_uninhibit_cb, - res); + task); } /**********************************************************************/ @@ -1561,17 +1498,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, device), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1579,33 +1507,29 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GVariant) result = NULL; CdProfile *profile; gchar *object_path = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); + g_autoptr(GTask) task = G_TASK (user_data); result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* create CdProfile object */ - g_variant_get (result, "(o)", - &object_path); + g_variant_get (result, "(o)", &object_path); profile = cd_profile_new (); cd_profile_set_object_path (profile, object_path); /* success */ - g_simple_async_result_set_op_res_gpointer (res_source, - profile, (GDestroyNotify) - g_object_unref); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, profile, (GDestroyNotify) g_object_unref); } /** @@ -1627,25 +1551,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - guint i; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; guint i; GVariantBuilder builder; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (qualifiers != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); /* squash char** into an array of strings */ g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); for (i = 0; qualifiers[i] != NULL; i++) g_variant_builder_add (&builder, "s", qualifiers[i]); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_get_profile_for_qualifiers); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "GetProfileForQualifiers", g_variant_new ("(as)", &builder), @@ -1653,7 +1574,7 @@ -1, cancellable, cd_device_get_profile_for_qualifiers_cb, - res); + task); } /**********************************************************************/ @@ -1675,17 +1596,12 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) + gssize tmp; + g_return_val_if_fail (g_task_is_valid (res, device), 0); + tmp = g_task_propagate_int (G_TASK (res), error); + if (tmp == -1) return CD_DEVICE_RELATION_UNKNOWN; - - return g_simple_async_result_get_op_res_gssize (simple); + return tmp; } static void @@ -1694,28 +1610,25 @@ gpointer user_data) { CdDeviceRelation relation; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *relation_string = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *relation_string = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_variant_get (result, "(s)", - &relation_string); + g_variant_get (result, "(s)", &relation_string); relation = cd_device_relation_from_string (relation_string); - - g_simple_async_result_set_op_res_gssize (res_source, relation); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_int (task, relation); } /** @@ -1737,18 +1650,16 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (CD_IS_PROFILE (profile)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_get_profile_relation); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "GetProfileRelation", g_variant_new ("(o)", cd_profile_get_object_path (profile)), @@ -1756,7 +1667,7 @@ -1, cancellable, cd_device_get_profile_relation_cb, - res); + task); } /**********************************************************************/ @@ -1778,41 +1689,31 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void cd_device_set_enabled_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) + GAsyncResult *res, + gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_device_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1834,24 +1735,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdDevicePrivate *priv = GET_PRIVATE (device); + GTask *task = NULL; g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (device->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - cd_device_set_enabled); - g_dbus_proxy_call (device->priv->proxy, + task = g_task_new (device, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "SetEnabled", g_variant_new ("(b)", enabled), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_device_set_enabled_cb, - res); + task); } /**********************************************************************/ @@ -1869,8 +1768,9 @@ const gchar * cd_device_get_object_path (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - return device->priv->object_path; + return priv->object_path; } /** @@ -1886,8 +1786,9 @@ gboolean cd_device_get_connected (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), FALSE); - return device->priv->proxy != NULL; + return priv->proxy != NULL; } /** @@ -1903,6 +1804,7 @@ gchar * cd_device_to_string (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); struct tm *time_tm; time_t t; gchar time_buf[256]; @@ -1911,13 +1813,13 @@ g_return_val_if_fail (CD_IS_DEVICE (device), NULL); /* get a human readable time */ - t = (time_t) device->priv->created; + t = (time_t) priv->created; time_tm = localtime (&t); strftime (time_buf, sizeof time_buf, "%c", time_tm); string = g_string_new (""); g_string_append_printf (string, " object-path: %s\n", - device->priv->object_path); + priv->object_path); g_string_append_printf (string, " created: %s\n", time_buf); @@ -1938,9 +1840,11 @@ gboolean cd_device_equal (CdDevice *device1, CdDevice *device2) { + CdDevicePrivate *priv1 = GET_PRIVATE (device1); + CdDevicePrivate *priv2 = GET_PRIVATE (device2); g_return_val_if_fail (CD_IS_DEVICE (device1), FALSE); g_return_val_if_fail (CD_IS_DEVICE (device2), FALSE); - return g_strcmp0 (device1->priv->id, device2->priv->id) == 0; + return g_strcmp0 (priv1->id, priv2->id) == 0; } /* @@ -1950,11 +1854,12 @@ _cd_device_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { CdDevice *device = CD_DEVICE (object); + CdDevicePrivate *priv = GET_PRIVATE (device); switch (prop_id) { case PROP_OBJECT_PATH: - g_free (device->priv->object_path); - device->priv->object_path = g_value_dup_string (value); + g_free (priv->object_path); + priv->object_path = g_value_dup_string (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1969,61 +1874,62 @@ cd_device_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { CdDevice *device = CD_DEVICE (object); + CdDevicePrivate *priv = GET_PRIVATE (device); switch (prop_id) { case PROP_OBJECT_PATH: - g_value_set_string (value, device->priv->object_path); + g_value_set_string (value, priv->object_path); break; case PROP_CONNECTED: - g_value_set_boolean (value, device->priv->proxy != NULL); + g_value_set_boolean (value, priv->proxy != NULL); break; case PROP_CREATED: - g_value_set_uint64 (value, device->priv->created); + g_value_set_uint64 (value, priv->created); break; case PROP_MODIFIED: - g_value_set_uint64 (value, device->priv->modified); + g_value_set_uint64 (value, priv->modified); break; case PROP_ID: - g_value_set_string (value, device->priv->id); + g_value_set_string (value, priv->id); break; case PROP_MODEL: - g_value_set_string (value, device->priv->model); + g_value_set_string (value, priv->model); break; case PROP_SERIAL: - g_value_set_string (value, device->priv->serial); + g_value_set_string (value, priv->serial); break; case PROP_SEAT: - g_value_set_string (value, device->priv->seat); + g_value_set_string (value, priv->seat); break; case PROP_FORMAT: - g_value_set_string (value, device->priv->format); + g_value_set_string (value, priv->format); break; case PROP_VENDOR: - g_value_set_string (value, device->priv->vendor); + g_value_set_string (value, priv->vendor); break; case PROP_PROFILING_INHIBITORS: - g_value_set_boxed (value, device->priv->profiling_inhibitors); + g_value_set_boxed (value, priv->profiling_inhibitors); break; case PROP_KIND: - g_value_set_uint (value, device->priv->kind); + g_value_set_uint (value, priv->kind); break; case PROP_COLORSPACE: - g_value_set_uint (value, device->priv->colorspace); + g_value_set_uint (value, priv->colorspace); break; case PROP_MODE: - g_value_set_uint (value, device->priv->mode); + g_value_set_uint (value, priv->mode); break; case PROP_SCOPE: - g_value_set_uint (value, device->priv->scope); + g_value_set_uint (value, priv->scope); break; case PROP_ENABLED: - g_value_set_boolean (value, device->priv->enabled); + g_value_set_boolean (value, priv->enabled); break; case PROP_OWNER: - g_value_set_uint (value, device->priv->owner); + g_value_set_uint (value, priv->owner); break; case PROP_EMBEDDED: - g_value_set_boolean (value, device->priv->embedded); + g_value_set_boolean (value, priv->embedded); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -2305,8 +2211,6 @@ NULL, NULL, FALSE, G_PARAM_READABLE)); - - g_type_class_add_private (klass, sizeof (CdDevicePrivate)); } /* @@ -2315,9 +2219,9 @@ static void cd_device_init (CdDevice *device) { - device->priv = CD_DEVICE_GET_PRIVATE (device); - device->priv->profiles = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - device->priv->metadata = g_hash_table_new_full (g_str_hash, + CdDevicePrivate *priv = GET_PRIVATE (device); + priv->profiles = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); + priv->metadata = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); @@ -2329,34 +2233,32 @@ static void cd_device_finalize (GObject *object) { - CdDevice *device; + CdDevice *device = CD_DEVICE (object); + CdDevicePrivate *priv = GET_PRIVATE (device); guint ret; g_return_if_fail (CD_IS_DEVICE (object)); - device = CD_DEVICE (object); - - g_hash_table_destroy (device->priv->metadata); - g_free (device->priv->object_path); - g_free (device->priv->id); - g_free (device->priv->model); - g_free (device->priv->serial); - g_free (device->priv->seat); - g_free (device->priv->format); - g_free (device->priv->vendor); - g_strfreev (device->priv->profiling_inhibitors); - g_ptr_array_unref (device->priv->profiles); - if (device->priv->proxy != NULL) { - ret = g_signal_handlers_disconnect_by_func (device->priv->proxy, + g_hash_table_destroy (priv->metadata); + g_free (priv->object_path); + g_free (priv->id); + g_free (priv->model); + g_free (priv->serial); + g_free (priv->seat); + g_free (priv->format); + g_free (priv->vendor); + g_strfreev (priv->profiling_inhibitors); + g_ptr_array_unref (priv->profiles); + if (priv->proxy != NULL) { + ret = g_signal_handlers_disconnect_by_func (priv->proxy, G_CALLBACK (cd_device_dbus_signal_cb), device); - g_assert (ret > 0); - ret = g_signal_handlers_disconnect_by_func (device->priv->proxy, +// g_assert (ret > 0); + ret = g_signal_handlers_disconnect_by_func (priv->proxy, G_CALLBACK (cd_device_dbus_properties_changed_cb), device); - g_assert (ret > 0); - g_object_unref (device->priv->proxy); - g_assert (!G_IS_DBUS_PROXY (device->priv->proxy)); +// g_assert (ret > 0); + g_object_unref (priv->proxy); } G_OBJECT_CLASS (cd_device_parent_class)->finalize (object); diff -Nru colord-1.2.12/lib/colord/cd-device.h colord-1.3.2/lib/colord/cd-device.h --- colord-1.2.12/lib/colord/cd-device.h 2015-05-01 13:53:33.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-device.h 2015-10-13 15:24:13.000000000 +0000 @@ -34,24 +34,13 @@ G_BEGIN_DECLS -#define CD_TYPE_DEVICE (cd_device_get_type ()) -#define CD_DEVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_DEVICE, CdDevice)) -#define CD_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_DEVICE, CdDeviceClass)) -#define CD_IS_DEVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_DEVICE)) -#define CD_IS_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_DEVICE)) -#define CD_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_DEVICE, CdDeviceClass)) #define CD_DEVICE_ERROR (cd_device_error_quark ()) #define CD_DEVICE_TYPE_ERROR (cd_device_error_get_type ()) -typedef struct _CdDevicePrivate CdDevicePrivate; +#define CD_TYPE_DEVICE (cd_device_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdDevice, cd_device, CD, DEVICE, GObject) -typedef struct -{ - GObject parent; - CdDevicePrivate *priv; -} CdDevice; - -typedef struct +struct _CdDeviceClass { GObjectClass parent_class; void (*changed) (CdDevice *device); @@ -65,9 +54,8 @@ void (*_cd_device_reserved6) (void); void (*_cd_device_reserved7) (void); void (*_cd_device_reserved8) (void); -} CdDeviceClass; +}; -GType cd_device_get_type (void); GQuark cd_device_error_quark (void); CdDevice *cd_device_new (void); CdDevice *cd_device_new_with_object_path (const gchar *object_path); diff -Nru colord-1.2.12/lib/colord/cd-dom.c colord-1.3.2/lib/colord/cd-dom.c --- colord-1.2.12/lib/colord/cd-dom.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-dom.c 2015-10-13 15:24:13.000000000 +0000 @@ -28,25 +28,24 @@ #include -#include "cd-cleanup.h" #include "cd-dom.h" static void cd_dom_class_init (CdDomClass *klass); static void cd_dom_init (CdDom *dom); static void cd_dom_finalize (GObject *object); -#define CD_DOM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_DOM, CdDomPrivate)) +#define GET_PRIVATE(o) (cd_dom_get_instance_private (o)) /** * CdDomPrivate: * * Private #CdDom data **/ -struct _CdDomPrivate +typedef struct { GNode *root; GNode *current; -}; +} CdDomPrivate; typedef struct { @@ -55,7 +54,7 @@ GHashTable *attributes; } CdDomNodeData; -G_DEFINE_TYPE (CdDom, cd_dom, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdDom, cd_dom, G_TYPE_OBJECT) /** * cd_dom_error_quark: @@ -108,12 +107,13 @@ gchar * cd_dom_to_string (CdDom *dom) { + CdDomPrivate *priv = GET_PRIVATE (dom); GString *string; g_return_val_if_fail (CD_IS_DOM (dom), NULL); string = g_string_new (NULL); - g_node_traverse (dom->priv->root, + g_node_traverse (priv->root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, @@ -135,6 +135,7 @@ GError **error) { CdDom *dom = (CdDom *) user_data; + CdDomPrivate *priv = GET_PRIVATE (dom); CdDomNodeData *data; GNode *new; guint i; @@ -155,8 +156,8 @@ /* add the node to the DOM */ new = g_node_new (data); - g_node_append (dom->priv->current, new); - dom->priv->current = new; + g_node_append (priv->current, new); + priv->current = new; } /** @@ -169,7 +170,8 @@ GError **error) { CdDom *dom = (CdDom *) user_data; - dom->priv->current = dom->priv->current->parent; + CdDomPrivate *priv = GET_PRIVATE (dom); + priv->current = priv->current->parent; } /** @@ -183,6 +185,7 @@ GError **error) { CdDom *dom = (CdDom *) user_data; + CdDomPrivate *priv = GET_PRIVATE (dom); CdDomNodeData *data; guint i; @@ -201,7 +204,7 @@ return; /* save cdata */ - data = dom->priv->current->data; + data = priv->current->data; g_string_append (data->cdata, text); } @@ -222,7 +225,7 @@ gssize data_len, GError **error) { - _cleanup_markup_parse_context_unref_ GMarkupParseContext *ctx = NULL; + g_autoptr(GMarkupParseContext) ctx = NULL; const GMarkupParser parser = { cd_dom_start_element_cb, cd_dom_end_element_cb, @@ -406,16 +409,17 @@ const GNode * cd_dom_get_node (CdDom *dom, const GNode *root, const gchar *path) { + CdDomPrivate *priv = GET_PRIVATE (dom); const GNode *node; guint i; - _cleanup_strv_free_ gchar **split = NULL; + g_auto(GStrv) split = NULL; g_return_val_if_fail (CD_IS_DOM (dom), NULL); g_return_val_if_fail (path != NULL, NULL); /* default value */ if (root == NULL) - root = dom->priv->root; + root = priv->root; node = root; split = g_strsplit (path, "/", -1); @@ -628,7 +632,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = cd_dom_finalize; - g_type_class_add_private (klass, sizeof (CdDomPrivate)); } /** @@ -637,9 +640,9 @@ static void cd_dom_init (CdDom *dom) { - dom->priv = CD_DOM_GET_PRIVATE (dom); - dom->priv->root = g_node_new (NULL); - dom->priv->current = dom->priv->root; + CdDomPrivate *priv = GET_PRIVATE (dom); + priv->root = g_node_new (NULL); + priv->current = priv->root; } /** @@ -649,14 +652,15 @@ cd_dom_finalize (GObject *object) { CdDom *dom = CD_DOM (object); + CdDomPrivate *priv = GET_PRIVATE (dom); - g_node_traverse (dom->priv->root, + g_node_traverse (priv->root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, cd_dom_destroy_node_cb, NULL); - g_node_destroy (dom->priv->root); + g_node_destroy (priv->root); G_OBJECT_CLASS (cd_dom_parent_class)->finalize (object); } @@ -677,4 +681,3 @@ dom = g_object_new (CD_TYPE_DOM, NULL); return CD_DOM (dom); } - diff -Nru colord-1.2.12/lib/colord/cd-dom.h colord-1.3.2/lib/colord/cd-dom.h --- colord-1.2.12/lib/colord/cd-dom.h 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-dom.h 2015-10-13 15:24:13.000000000 +0000 @@ -32,24 +32,13 @@ G_BEGIN_DECLS -#define CD_TYPE_DOM (cd_dom_get_type ()) -#define CD_DOM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_DOM, CdDom)) -#define CD_DOM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_DOM, CdDomClass)) -#define CD_IS_DOM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_DOM)) -#define CD_IS_DOM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_DOM)) -#define CD_DOM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_DOM, CdDomClass)) #define CD_DOM_ERROR (cd_dom_error_quark ()) #define CD_DOM_TYPE_ERROR (cd_dom_error_get_type ()) -typedef struct _CdDomPrivate CdDomPrivate; +#define CD_TYPE_DOM (cd_dom_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdDom, cd_dom, CD, DOM, GObject) -typedef struct -{ - GObject parent; - CdDomPrivate *priv; -} CdDom; - -typedef struct +struct _CdDomClass { GObjectClass parent_class; /*< private >*/ @@ -62,9 +51,8 @@ void (*_cd_dom_reserved6) (void); void (*_cd_dom_reserved7) (void); void (*_cd_dom_reserved8) (void); -} CdDomClass; +}; -GType cd_dom_get_type (void); GQuark cd_dom_error_quark (void); CdDom *cd_dom_new (void); gchar *cd_dom_to_string (CdDom *dom); diff -Nru colord-1.2.12/lib/colord/cd-edid.c colord-1.3.2/lib/colord/cd-edid.c --- colord-1.2.12/lib/colord/cd-edid.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-edid.c 2015-10-13 15:24:13.000000000 +0000 @@ -29,15 +29,14 @@ #include #endif -#include "cd-cleanup.h" #include "cd-edid.h" #include "cd-quirk.h" static void cd_edid_finalize (GObject *object); -#define CD_EDID_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_EDID, CdEdidPrivate)) +#define GET_PRIVATE(o) (cd_edid_get_instance_private (o)) -struct _CdEdidPrivate +typedef struct { CdColorYxy *red; CdColorYxy *green; @@ -52,9 +51,9 @@ gdouble gamma; guint height; guint width; -}; +} CdEdidPrivate; -G_DEFINE_TYPE (CdEdid, cd_edid, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdEdid, cd_edid, G_TYPE_OBJECT) #define CD_EDID_OFFSET_PNPID 0x08 #define CD_EDID_OFFSET_SERIAL 0x0c @@ -101,8 +100,9 @@ const gchar * cd_edid_get_monitor_name (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->monitor_name; + return priv->monitor_name; } /** @@ -117,7 +117,7 @@ struct udev_list_entry *e; struct udev_list_entry *v; struct udev *udev; - _cleanup_free_ gchar *modalias = NULL; + g_autofree gchar *modalias = NULL; /* connect to the hwdb */ udev = udev_new (); @@ -155,7 +155,7 @@ "/usr/share/misc/pnp.ids", "/usr/share/libgnome-desktop/pnp.ids", NULL }; - _cleanup_free_ gchar *data = NULL; + g_autofree gchar *data = NULL; for (i = 0; pnp_ids[i] != NULL; i++) { ret = g_file_get_contents (pnp_ids[i], &data, NULL, NULL); @@ -196,7 +196,7 @@ const gchar * cd_edid_get_vendor_name (CdEdid *edid) { - CdEdidPrivate *priv = edid->priv; + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); if (priv->vendor_name == NULL) priv->vendor_name = cd_edid_convert_pnp_id_to_string (priv->pnp_id); @@ -216,8 +216,9 @@ const gchar * cd_edid_get_serial_number (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->serial_number; + return priv->serial_number; } /** @@ -233,8 +234,9 @@ const gchar * cd_edid_get_eisa_id (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->eisa_id; + return priv->eisa_id; } /** @@ -250,8 +252,9 @@ const gchar * cd_edid_get_checksum (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->checksum; + return priv->checksum; } /** @@ -267,8 +270,9 @@ const gchar * cd_edid_get_pnp_id (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->pnp_id; + return priv->pnp_id; } /** @@ -284,8 +288,9 @@ guint cd_edid_get_width (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), 0); - return edid->priv->width; + return priv->width; } /** @@ -301,8 +306,9 @@ guint cd_edid_get_height (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), 0); - return edid->priv->height; + return priv->height; } /** @@ -318,8 +324,9 @@ gdouble cd_edid_get_gamma (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), 0.0f); - return edid->priv->gamma; + return priv->gamma; } /** @@ -335,8 +342,9 @@ const CdColorYxy * cd_edid_get_red (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->red; + return priv->red; } /** @@ -352,8 +360,9 @@ const CdColorYxy * cd_edid_get_green (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->green; + return priv->green; } /** @@ -369,8 +378,9 @@ const CdColorYxy * cd_edid_get_blue (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->blue; + return priv->blue; } /** @@ -386,8 +396,9 @@ const CdColorYxy * cd_edid_get_white (CdEdid *edid) { + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_val_if_fail (CD_IS_EDID (edid), NULL); - return edid->priv->white; + return priv->white; } /** @@ -401,7 +412,7 @@ void cd_edid_reset (CdEdid *edid) { - CdEdidPrivate *priv = edid->priv; + CdEdidPrivate *priv = GET_PRIVATE (edid); g_return_if_fail (CD_IS_EDID (edid)); @@ -524,7 +535,7 @@ gboolean cd_edid_parse (CdEdid *edid, GBytes *edid_data, GError **error) { - CdEdidPrivate *priv = edid->priv; + CdEdidPrivate *priv = GET_PRIVATE (edid); const guint8 *data; gchar *tmp; gsize length; @@ -659,7 +670,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = cd_edid_finalize; - g_type_class_add_private (klass, sizeof (CdEdidPrivate)); } /** @@ -668,12 +678,12 @@ static void cd_edid_init (CdEdid *edid) { - edid->priv = CD_EDID_GET_PRIVATE (edid); - edid->priv->pnp_id = g_new0 (gchar, 4); - edid->priv->red = cd_color_yxy_new (); - edid->priv->green = cd_color_yxy_new (); - edid->priv->blue = cd_color_yxy_new (); - edid->priv->white = cd_color_yxy_new (); + CdEdidPrivate *priv = GET_PRIVATE (edid); + priv->pnp_id = g_new0 (gchar, 4); + priv->red = cd_color_yxy_new (); + priv->green = cd_color_yxy_new (); + priv->blue = cd_color_yxy_new (); + priv->white = cd_color_yxy_new (); } /** @@ -683,7 +693,7 @@ cd_edid_finalize (GObject *object) { CdEdid *edid = CD_EDID (object); - CdEdidPrivate *priv = edid->priv; + CdEdidPrivate *priv = GET_PRIVATE (edid); g_free (priv->monitor_name); g_free (priv->vendor_name); diff -Nru colord-1.2.12/lib/colord/cd-edid.h colord-1.3.2/lib/colord/cd-edid.h --- colord-1.2.12/lib/colord/cd-edid.h 2015-05-01 13:55:26.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-edid.h 2015-10-13 15:24:13.000000000 +0000 @@ -32,23 +32,10 @@ G_BEGIN_DECLS -#define CD_TYPE_EDID (cd_edid_get_type ()) -#define CD_EDID(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_EDID, CdEdid)) -#define CD_EDID_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_EDID, CdEdidClass)) -#define CD_IS_EDID(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_EDID)) -#define CD_IS_EDID_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_EDID)) -#define CD_EDID_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_EDID, CdEdidClass)) #define CD_EDID_ERROR (cd_edid_error_quark ()) -typedef struct _CdEdidPrivate CdEdidPrivate; -typedef struct _CdEdid CdEdid; -typedef struct _CdEdidClass CdEdidClass; - -struct _CdEdid -{ - GObject parent; - CdEdidPrivate *priv; -}; +#define CD_TYPE_EDID (cd_edid_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdEdid, cd_edid, CD, EDID, GObject) struct _CdEdidClass { @@ -77,7 +64,6 @@ CD_EDID_ERROR_LAST }; -GType cd_edid_get_type (void); GQuark cd_edid_error_quark (void); CdEdid *cd_edid_new (void); diff -Nru colord-1.2.12/lib/colord/cd-enum.c colord-1.3.2/lib/colord/cd-enum.c --- colord-1.2.12/lib/colord/cd-enum.c 2015-06-08 13:17:25.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-enum.c 2015-10-27 10:16:08.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2010-2014 Richard Hughes + * Copyright (C) 2010-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -177,6 +177,9 @@ {CD_SENSOR_CAP_SPOT, "spot"}, {CD_SENSOR_CAP_WIDE_GAMUT_LCD_CCFL, "wide-gamut-lcd-ccfl"}, {CD_SENSOR_CAP_WIDE_GAMUT_LCD_RGB_LED, "wide-gamut-lcd-rgb-led"}, + {CD_SENSOR_CAP_SPECTRAL, "spectral"}, + {CD_SENSOR_CAP_CALIBRATION_DARK, "calibration-dark"}, + {CD_SENSOR_CAP_CALIBRATION_IRRADIANCE, "calibration-irradiance"}, {0, NULL} }; @@ -663,6 +666,10 @@ return CD_DBUS_INTERFACE_SENSOR ".RequiredPositionCalibrate"; if (error_enum == CD_SENSOR_ERROR_REQUIRED_POSITION_SURFACE) return CD_DBUS_INTERFACE_SENSOR ".RequiredPositionSurface"; + if (error_enum == CD_SENSOR_ERROR_REQUIRED_DARK_CALIBRATION) + return CD_DBUS_INTERFACE_SENSOR ".RequiredDarkCalibration"; + if (error_enum == CD_SENSOR_ERROR_REQUIRED_IRRADIANCE_CALIBRATION) + return CD_DBUS_INTERFACE_SENSOR ".RequiredIrradianceCalibration"; return NULL; } @@ -696,6 +703,10 @@ return CD_SENSOR_ERROR_REQUIRED_POSITION_CALIBRATE; if (g_strcmp0 (error_desc, CD_DBUS_INTERFACE_SENSOR ".RequiredPositionSurface") == 0) return CD_SENSOR_ERROR_REQUIRED_POSITION_SURFACE; + if (g_strcmp0 (error_desc, CD_DBUS_INTERFACE_SENSOR ".RequiredDarkCalibration") == 0) + return CD_SENSOR_ERROR_REQUIRED_DARK_CALIBRATION; + if (g_strcmp0 (error_desc, CD_DBUS_INTERFACE_SENSOR ".RequiredIrradianceCalibration") == 0) + return CD_SENSOR_ERROR_REQUIRED_IRRADIANCE_CALIBRATION; return CD_SENSOR_ERROR_LAST; } diff -Nru colord-1.2.12/lib/colord/cd-enum.h colord-1.3.2/lib/colord/cd-enum.h --- colord-1.2.12/lib/colord/cd-enum.h 2015-06-08 13:17:25.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-enum.h 2015-10-27 10:16:08.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2010-2014 Richard Hughes + * Copyright (C) 2010-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -203,7 +203,7 @@ /** * CdSensorCap: * - * The sensor capabilities. + * The sensor capabilities, i.e. things the sensor can do. **/ typedef enum { CD_SENSOR_CAP_UNKNOWN, /* Since: 0.1.6 */ @@ -213,7 +213,7 @@ CD_SENSOR_CAP_SPOT, /* Since: 0.1.6 */ CD_SENSOR_CAP_PROJECTOR, /* Since: 0.1.6 */ CD_SENSOR_CAP_AMBIENT, /* Since: 0.1.6 */ - CD_SENSOR_CAP_CALIBRATION, /* Since: 0.1.6 */ + CD_SENSOR_CAP_CALIBRATION, /* Since: 0.1.6 (hint: raw measurement) */ CD_SENSOR_CAP_LED, /* Since: 0.1.17 */ CD_SENSOR_CAP_PLASMA, /* Since: 0.1.29 */ CD_SENSOR_CAP_LCD_CCFL, /* Since: 0.1.31 */ @@ -221,6 +221,9 @@ CD_SENSOR_CAP_LCD_WHITE_LED, /* Since: 0.1.31 */ CD_SENSOR_CAP_WIDE_GAMUT_LCD_CCFL, /* Since: 0.1.31 */ CD_SENSOR_CAP_WIDE_GAMUT_LCD_RGB_LED, /* Since: 0.1.31 */ + CD_SENSOR_CAP_SPECTRAL, /* Since: 1.3.1 */ + CD_SENSOR_CAP_CALIBRATION_DARK, /* Since: 1.3.1 */ + CD_SENSOR_CAP_CALIBRATION_IRRADIANCE, /* Since: 1.3.1 */ /*< private >*/ CD_SENSOR_CAP_LAST } CdSensorCap; @@ -318,6 +321,8 @@ * @CD_SENSOR_ERROR_FAILED_TO_AUTHENTICATE: Authentication failed * @CD_SENSOR_ERROR_REQUIRED_POSITION_CALIBRATE: The sensor needs to be in the calibrate position * @CD_SENSOR_ERROR_REQUIRED_POSITION_SURFACE: The sensor needs to be in the surface position + * @CD_SENSOR_ERROR_REQUIRED_DARK_CALIBRATION: The sensor needs dark calibration + * @CD_SENSOR_ERROR_REQUIRED_IRRADIANCE_CALIBRATION: The sensor needs irradiance calibration * * The sensor error code. * @@ -333,6 +338,8 @@ CD_SENSOR_ERROR_FAILED_TO_AUTHENTICATE, /* Since: 0.1.26 */ CD_SENSOR_ERROR_REQUIRED_POSITION_CALIBRATE, /* Since: 0.1.26 */ CD_SENSOR_ERROR_REQUIRED_POSITION_SURFACE, /* Since: 0.1.26 */ + CD_SENSOR_ERROR_REQUIRED_DARK_CALIBRATION, /* Since: 1.2.13 */ + CD_SENSOR_ERROR_REQUIRED_IRRADIANCE_CALIBRATION, /* Since: 1.1.1 */ /*< private >*/ CD_SENSOR_ERROR_LAST } CdSensorError; diff -Nru colord-1.2.12/lib/colord/cd-icc.c colord-1.3.2/lib/colord/cd-icc.c --- colord-1.2.12/lib/colord/cd-icc.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-icc.c 2016-03-03 09:37:40.000000000 +0000 @@ -33,7 +33,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-context-lcms.h" #include "cd-icc.h" @@ -42,7 +41,7 @@ static gboolean cd_icc_load_named_colors (CdIcc *icc, GError **error); static void cd_icc_finalize (GObject *object); -#define CD_ICC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_ICC, CdIccPrivate)) +#define GET_PRIVATE(o) (cd_icc_get_instance_private (o)) typedef enum { CD_MLUC_DESCRIPTION, @@ -57,7 +56,7 @@ * * Private #CdIcc data **/ -struct _CdIccPrivate +typedef struct { CdColorspace colorspace; CdProfileKind kind; @@ -77,9 +76,9 @@ CdColorXYZ red; CdColorXYZ green; CdColorXYZ blue; -}; +} CdIccPrivate; -G_DEFINE_TYPE (CdIcc, cd_icc, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdIcc, cd_icc, G_TYPE_OBJECT) enum { PROP_0, @@ -163,7 +162,7 @@ static gpointer cd_icc_read_tag (CdIcc *icc, cmsTagSignature sig, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); gchar sig_string[5]; gpointer tmp; @@ -194,7 +193,7 @@ static gboolean cd_icc_write_tag (CdIcc *icc, cmsTagSignature sig, gpointer data, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); gchar sig_string[5]; /* ensure context error is not present to aid debugging */ @@ -235,7 +234,7 @@ gchar * cd_icc_to_string (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsInt32Number tag_size; cmsTagSignature sig; cmsTagSignature sig_link; @@ -292,7 +291,7 @@ /* date and time */ created = cd_icc_get_created (icc); if (created != NULL) { - _cleanup_free_ gchar *created_str = NULL; + g_autofree gchar *created_str = NULL; created_str = g_date_time_format (created, "%F, %T"); g_string_append_printf (str, " Date, Time\t= %s\n", created_str); g_date_time_unref (created); @@ -410,9 +409,9 @@ gchar country_code[3] = "\0\0\0"; gchar language_code[3] = "\0\0\0"; guint32 text_size; - _cleanup_free_ gchar *text_buffer = NULL; - _cleanup_free_ gunichar *wtext = NULL; - _cleanup_error_free_ GError *error = NULL; + g_autofree gchar *text_buffer = NULL; + g_autofree gunichar *wtext = NULL; + g_autoptr(GError) error = NULL; ret = cmsMLUtranslationsCodes (mlu, j, @@ -548,8 +547,8 @@ for (entry = cmsDictGetEntryList (dict); entry != NULL; entry = cmsDictNextEntry (entry)) { - _cleanup_free_ gchar *ascii_name = NULL; - _cleanup_free_ gchar *ascii_value = NULL; + g_autofree gchar *ascii_name = NULL; + g_autofree gchar *ascii_value = NULL; /* convert from wchar_t to UTF-8 */ ascii_name = g_ucs4_to_utf8 ((gunichar *) entry->Name, -1, @@ -604,7 +603,7 @@ continue; } for (j = 0; j < tmp; j++) { - _cleanup_string_free_ GString *string = NULL; + g_autoptr(GString) string = NULL; /* parse title */ string = g_string_new (""); @@ -673,7 +672,7 @@ gchar ** cd_icc_get_tags (CdIcc *icc, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); GPtrArray *tags; cmsTagSignature sig; gchar *tmp; @@ -721,7 +720,7 @@ GBytes * cd_icc_get_tag_data (CdIcc *icc, const gchar *tag, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsInt32Number tag_size; cmsTagSignature sig; gchar *tmp; @@ -747,7 +746,7 @@ /* return data */ tmp = g_new0 (gchar, tag_size); cmsReadRawTag (priv->lcms_profile, sig, tmp, tag_size); - return g_bytes_new_with_free_func (tmp, tag_size, g_free, NULL); + return g_bytes_new_with_free_func (tmp, tag_size, g_free, tmp); } /** @@ -765,7 +764,7 @@ gboolean cd_icc_set_tag_data (CdIcc *icc, const gchar *tag, GBytes *data, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsTagSignature sig; gboolean ret; @@ -863,7 +862,7 @@ static gboolean cd_icc_calc_whitepoint (CdIcc *icc, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsBool bpc[2] = { FALSE, FALSE }; cmsCIEXYZ whitepoint; cmsFloat64Number adaption[2] = { 0, 0 }; @@ -922,7 +921,7 @@ static gboolean cd_icc_load_characterization_data (CdIcc *icc, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsMLU *mlu; gboolean ret = TRUE; GError *error_local = NULL; @@ -963,7 +962,7 @@ static gboolean cd_icc_load_primaries (CdIcc *icc, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsCIEXYZ *cie_xyz; cmsHPROFILE xyz_profile = NULL; cmsHTRANSFORM transform = NULL; @@ -1043,9 +1042,10 @@ const gunichar *value, GError **error) { - _cleanup_error_free_ GError *error_local = NULL; - _cleanup_free_ gchar *ascii_name = NULL; - _cleanup_free_ gchar *ascii_value = NULL; + CdIccPrivate *priv = GET_PRIVATE (icc); + g_autoptr(GError) error_local = NULL; + g_autofree gchar *ascii_name = NULL; + g_autofree gchar *ascii_value = NULL; /* parse name */ ascii_name = g_ucs4_to_utf8 (name, -1, NULL, NULL, &error_local); @@ -1070,7 +1070,7 @@ } /* all okay */ - g_hash_table_insert (icc->priv->metadata, + g_hash_table_insert (priv->metadata, g_strdup (ascii_name), g_strdup (ascii_value)); return TRUE; @@ -1117,7 +1117,7 @@ static gboolean cd_icc_load (CdIcc *icc, CdIccLoadFlags flags, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsColorSpaceSignature colorspace; cmsProfileClassSignature profile_class; guint i; @@ -1201,7 +1201,7 @@ CdIccLoadFlags flags, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), FALSE); g_return_val_if_fail (data != NULL, FALSE); @@ -1254,8 +1254,8 @@ GError **error) { gboolean ret = FALSE; - _cleanup_free_ gunichar *mb_key = NULL; - _cleanup_free_ gunichar *mb_value = NULL; + g_autofree gunichar *mb_key = NULL; + g_autofree gunichar *mb_value = NULL; mb_key = g_utf8_to_ucs4 (key, -1, NULL, NULL, error); if (mb_key == NULL) @@ -1307,8 +1307,8 @@ CdMluObject *obj = NULL; guint type; gunichar *wtext; - _cleanup_free_ gchar *key = NULL; - _cleanup_strv_free_ gchar **split = NULL; + g_autofree gchar *key = NULL; + g_auto(GStrv) split = NULL; /* untranslated version */ if (locale == NULL || locale[0] == '\0') { @@ -1365,6 +1365,7 @@ const gchar *value, GError **error) { + CdIccPrivate *priv = GET_PRIVATE (icc); cmsMLU *mlu = NULL; gboolean ret = TRUE; @@ -1375,7 +1376,7 @@ } /* set value */ - mlu = cmsMLUalloc (icc->priv->context_lcms, 1); + mlu = cmsMLUalloc (priv->context_lcms, 1); ret = cmsMLUsetASCII (mlu, "en", "US", value); if (!ret) { g_set_error_literal (error, @@ -1430,6 +1431,7 @@ GHashTable *hash, GError **error) { + CdIccPrivate *priv = GET_PRIVATE (icc); CdMluObject *obj; GError *error_local = NULL; GList *l; @@ -1438,8 +1440,8 @@ const gchar *value; gboolean ret = TRUE; guint i; - _cleanup_list_free_ GList *keys = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GList) keys = NULL; + g_autoptr(GPtrArray) array = NULL; /* convert all the hash entries into CdMluObject's */ keys = g_hash_table_get_keys (hash); @@ -1469,7 +1471,7 @@ g_ptr_array_sort (array, cd_util_sort_mlu_array_cb); /* create MLU object to hold all the translations */ - mlu = cmsMLUalloc (icc->priv->context_lcms, array->len); + mlu = cmsMLUalloc (priv->context_lcms, array->len); for (i = 0; i < array->len; i++) { obj = g_ptr_array_index (array, i); if (obj->language_code == NULL && @@ -1513,7 +1515,7 @@ static gboolean cd_icc_save_file_mkdir_parents (GFile *file, GError **error) { - _cleanup_object_unref_ GFile *parent_dir = NULL; + g_autoptr(GFile) parent_dir = NULL; /* get parent directory */ parent_dir = g_file_get_parent (file); @@ -1539,10 +1541,10 @@ static GBytes * cd_icc_serialize_profile (CdIcc *icc, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsUInt32Number length = 0; gboolean ret; - _cleanup_free_ gchar *data_tmp = NULL; + g_autofree gchar *data_tmp = NULL; /* get size of profile */ ret = cmsSaveProfileToMem (priv->lcms_profile, @@ -1599,7 +1601,7 @@ CdIccSaveFlags flags, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsHANDLE dict = NULL; const gchar *key; const gchar *value; @@ -1607,9 +1609,9 @@ GBytes *data = NULL; GList *l; guint i; - _cleanup_list_free_ GList *md_keys = NULL; + g_autoptr(GList) md_keys = NULL; - g_return_val_if_fail (CD_IS_ICC (icc), FALSE); + g_return_val_if_fail (CD_IS_ICC (icc), NULL); /* convert profile kind */ for (i = 0; map_profile_kind[i].colord != CD_PROFILE_KIND_LAST; i++) { @@ -1764,8 +1766,9 @@ const gchar * cd_icc_get_characterization_data (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return icc->priv->characterization_data; + return priv->characterization_data; } /** @@ -1780,9 +1783,10 @@ void cd_icc_set_characterization_data (CdIcc *icc, const gchar *data) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (CD_IS_ICC (icc)); - g_free (icc->priv->characterization_data); - icc->priv->characterization_data = g_strdup (data); + g_free (priv->characterization_data); + priv->characterization_data = g_strdup (data); } /** @@ -1807,8 +1811,8 @@ GError **error) { gboolean ret; - _cleanup_bytes_unref_ GBytes *data = NULL; - _cleanup_error_free_ GError *error_local = NULL; + g_autoptr(GBytes) data = NULL; + g_autoptr(GError) error_local = NULL; g_return_val_if_fail (CD_IS_ICC (icc), FALSE); g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -1862,15 +1866,16 @@ GCancellable *cancellable, GError **error) { + CdIccPrivate *priv = GET_PRIVATE (icc); const gchar *root = "edid"; /* TODO: only for cd_icc_create_from_edid() */ - _cleanup_free_ gchar *basename = NULL; - _cleanup_free_ gchar *filename = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autofree gchar *basename = NULL; + g_autofree gchar *filename = NULL; + g_autoptr(GFile) file = NULL; g_return_val_if_fail (CD_IS_ICC (icc), FALSE); /* build a per-user filename */ - basename = g_strdup_printf ("%s-%s.icc", root, icc->priv->checksum); + basename = g_strdup_printf ("%s-%s.icc", root, priv->checksum); filename = g_build_filename (g_get_user_data_dir (), "icc", basename, NULL); file = g_file_new_for_path (filename); return cd_icc_save_file (icc, file, flags, cancellable, error); @@ -1889,8 +1894,9 @@ void cd_icc_set_filename (CdIcc *icc, const gchar *filename) { - g_free (icc->priv->filename); - icc->priv->filename = g_strdup (filename); + CdIccPrivate *priv = GET_PRIVATE (icc); + g_free (priv->filename); + priv->filename = g_strdup (filename); } /** @@ -1912,12 +1918,12 @@ GCancellable *cancellable, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); gboolean ret = FALSE; gsize length; - _cleanup_error_free_ GError *error_local = NULL; - _cleanup_free_ gchar *data = NULL; - _cleanup_object_unref_ GFileInfo *info = NULL; + g_autoptr(GError) error_local = NULL; + g_autofree gchar *data = NULL; + g_autoptr(GFileInfo) info = NULL; g_return_val_if_fail (CD_IS_ICC (icc), FALSE); g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -1982,7 +1988,7 @@ CdIccLoadFlags flags, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); FILE *stream = NULL; g_return_val_if_fail (CD_IS_ICC (icc), FALSE); @@ -2025,8 +2031,9 @@ gpointer cd_icc_get_handle (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return icc->priv->lcms_profile; + return priv->lcms_profile; } /** @@ -2043,8 +2050,9 @@ gpointer cd_icc_get_context (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return icc->priv->context_lcms; + return priv->context_lcms; } /** @@ -2077,7 +2085,7 @@ CdIccLoadFlags flags, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsContext context; g_return_val_if_fail (CD_IS_ICC (icc), FALSE); @@ -2112,8 +2120,9 @@ guint32 cd_icc_get_size (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), 0); - return icc->priv->size; + return priv->size; } /** @@ -2129,7 +2138,7 @@ const gchar * cd_icc_get_filename (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); return priv->filename; } @@ -2147,8 +2156,9 @@ gdouble cd_icc_get_version (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), 0.0f); - return icc->priv->version; + return priv->version; } /** @@ -2163,8 +2173,9 @@ void cd_icc_set_version (CdIcc *icc, gdouble version) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (CD_IS_ICC (icc)); - icc->priv->version = version; + priv->version = version; g_object_notify (G_OBJECT (icc), "version"); } @@ -2181,8 +2192,9 @@ CdProfileKind cd_icc_get_kind (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), CD_PROFILE_KIND_UNKNOWN); - return icc->priv->kind; + return priv->kind; } /** @@ -2197,8 +2209,9 @@ void cd_icc_set_kind (CdIcc *icc, CdProfileKind kind) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (CD_IS_ICC (icc)); - icc->priv->kind = kind; + priv->kind = kind; g_object_notify (G_OBJECT (icc), "kind"); } @@ -2215,8 +2228,9 @@ CdColorspace cd_icc_get_colorspace (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), CD_COLORSPACE_UNKNOWN); - return icc->priv->colorspace; + return priv->colorspace; } /** @@ -2231,8 +2245,9 @@ void cd_icc_set_colorspace (CdIcc *icc, CdColorspace colorspace) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (CD_IS_ICC (icc)); - icc->priv->colorspace = colorspace; + priv->colorspace = colorspace; g_object_notify (G_OBJECT (icc), "colorspace"); } @@ -2249,8 +2264,9 @@ GHashTable * cd_icc_get_metadata (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return g_hash_table_ref (icc->priv->metadata); + return g_hash_table_ref (priv->metadata); } /** @@ -2267,9 +2283,10 @@ const gchar * cd_icc_get_metadata_item (CdIcc *icc, const gchar *key) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); g_return_val_if_fail (key != NULL, NULL); - return (const gchar *) g_hash_table_lookup (icc->priv->metadata, key); + return (const gchar *) g_hash_table_lookup (priv->metadata, key); } /** @@ -2286,12 +2303,13 @@ void cd_icc_add_metadata (CdIcc *icc, const gchar *key, const gchar *value) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (CD_IS_ICC (icc)); g_return_if_fail (key != NULL); g_return_if_fail (g_utf8_validate (key, -1, NULL)); g_return_if_fail (value != NULL); g_return_if_fail (g_utf8_validate (value, -1, NULL)); - g_hash_table_insert (icc->priv->metadata, + g_hash_table_insert (priv->metadata, g_strdup (key), g_strdup (value)); } @@ -2308,9 +2326,10 @@ void cd_icc_remove_metadata (CdIcc *icc, const gchar *key) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (CD_IS_ICC (icc)); g_return_if_fail (key != NULL); - g_hash_table_remove (icc->priv->metadata, key); + g_hash_table_remove (priv->metadata, key); } /** @@ -2319,6 +2338,7 @@ static gboolean cd_icc_load_named_colors (CdIcc *icc, GError **error) { + CdIccPrivate *priv = GET_PRIVATE (icc); CdColorLab lab; CdColorSwatch *swatch; cmsNAMEDCOLORLIST *nc2; @@ -2377,7 +2397,7 @@ swatch = cd_color_swatch_new (); cd_color_swatch_set_name (swatch, string->str); cd_color_swatch_set_value (swatch, (const CdColorLab *) &lab); - g_ptr_array_add (icc->priv->named_colors, swatch); + g_ptr_array_add (priv->named_colors, swatch); } g_string_free (string, TRUE); } @@ -2399,8 +2419,9 @@ GPtrArray * cd_icc_get_named_colors (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return g_ptr_array_ref (icc->priv->named_colors); + return g_ptr_array_ref (priv->named_colors); } /** @@ -2418,8 +2439,9 @@ gboolean cd_icc_get_can_delete (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), FALSE); - return icc->priv->can_delete; + return priv->can_delete; } /** @@ -2435,7 +2457,7 @@ GDateTime * cd_icc_get_created (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); struct tm created_tm; time_t created_t; @@ -2472,8 +2494,9 @@ const gchar * cd_icc_get_checksum (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return icc->priv->checksum; + return priv->checksum; } /** @@ -2502,7 +2525,7 @@ cmsTagSignature *sigs, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsMLU *mlu = NULL; const gchar *country_code = "\0\0\0"; const gchar *language_code = "\0\0\0"; @@ -2510,9 +2533,9 @@ gchar *tmp; guint32 text_size; guint i; - _cleanup_free_ gchar *locale_key = NULL; - _cleanup_free_ gchar *text_buffer = NULL; - _cleanup_free_ gunichar *wtext = NULL; + g_autofree gchar *locale_key = NULL; + g_autofree gchar *text_buffer = NULL; + g_autofree gunichar *wtext = NULL; g_return_val_if_fail (CD_IS_ICC (icc), NULL); @@ -2723,7 +2746,7 @@ void cd_icc_set_description (CdIcc *icc, const gchar *locale, const gchar *value) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (value == NULL || g_utf8_validate (value, -1, NULL)); g_hash_table_insert (priv->mluc_data[CD_MLUC_DESCRIPTION], cd_icc_get_locale_key (locale), @@ -2745,7 +2768,7 @@ GList *l; const gchar *key; const gchar *value; - _cleanup_list_free_ GList *keys = NULL; + g_autoptr(GList) keys = NULL; g_return_if_fail (CD_IS_ICC (icc)); @@ -2771,7 +2794,7 @@ void cd_icc_set_copyright (CdIcc *icc, const gchar *locale, const gchar *value) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (value == NULL || g_utf8_validate (value, -1, NULL)); g_hash_table_insert (priv->mluc_data[CD_MLUC_COPYRIGHT], cd_icc_get_locale_key (locale), @@ -2793,7 +2816,7 @@ const gchar *key; const gchar *value; GList *l; - _cleanup_list_free_ GList *keys = NULL; + g_autoptr(GList) keys = NULL; g_return_if_fail (CD_IS_ICC (icc)); @@ -2819,7 +2842,7 @@ void cd_icc_set_manufacturer (CdIcc *icc, const gchar *locale, const gchar *value) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (value == NULL || g_utf8_validate (value, -1, NULL)); g_hash_table_insert (priv->mluc_data[CD_MLUC_MANUFACTURER], cd_icc_get_locale_key (locale), @@ -2841,7 +2864,7 @@ const gchar *key; const gchar *value; GList *l; - _cleanup_list_free_ GList *keys = NULL; + g_autoptr(GList) keys = NULL; g_return_if_fail (CD_IS_ICC (icc)); @@ -2867,7 +2890,7 @@ void cd_icc_set_model (CdIcc *icc, const gchar *locale, const gchar *value) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_if_fail (value == NULL || g_utf8_validate (value, -1, NULL)); g_hash_table_insert (priv->mluc_data[CD_MLUC_MODEL], cd_icc_get_locale_key (locale), @@ -2889,7 +2912,7 @@ const gchar *key; const gchar *value; GList *l; - _cleanup_list_free_ GList *keys = NULL; + g_autoptr(GList) keys = NULL; g_return_if_fail (CD_IS_ICC (icc)); @@ -2917,8 +2940,9 @@ guint cd_icc_get_temperature (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), 0); - return icc->priv->temperature; + return priv->temperature; } /** @@ -2936,8 +2960,9 @@ const CdColorXYZ * cd_icc_get_red (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return &icc->priv->red; + return &priv->red; } /** @@ -2955,8 +2980,9 @@ const CdColorXYZ * cd_icc_get_green (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return &icc->priv->green; + return &priv->green; } /** @@ -2974,8 +3000,9 @@ const CdColorXYZ * cd_icc_get_blue (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return &icc->priv->blue; + return &priv->blue; } /** @@ -2993,8 +3020,9 @@ const CdColorXYZ * cd_icc_get_white (CdIcc *icc) { + CdIccPrivate *priv = GET_PRIVATE (icc); g_return_val_if_fail (CD_IS_ICC (icc), NULL); - return &icc->priv->white; + return &priv->white; } /** @@ -3011,7 +3039,7 @@ gboolean cd_icc_create_default (CdIcc *icc, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); gboolean ret = TRUE; /* not loaded */ @@ -3066,7 +3094,7 @@ gboolean cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); const gchar *data; /* not loaded */ @@ -3138,7 +3166,7 @@ const CdColorYxy *white, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsCIExyYTRIPLE chroma; cmsCIExyY white_point; cmsToneCurve *transfer_curve[3] = { NULL, NULL, NULL }; @@ -3221,6 +3249,7 @@ GPtrArray * cd_icc_get_vcgt (CdIcc *icc, guint size, GError **error) { + CdIccPrivate *priv = GET_PRIVATE (icc); CdColorRGB *tmp; cmsFloat32Number in; const cmsToneCurve **vcgt; @@ -3228,10 +3257,10 @@ guint i; g_return_val_if_fail (CD_IS_ICC (icc), NULL); - g_return_val_if_fail (icc->priv->lcms_profile != NULL, NULL); + g_return_val_if_fail (priv->lcms_profile != NULL, NULL); /* get tone curves from icc */ - vcgt = cmsReadTag (icc->priv->lcms_profile, cmsSigVcgtType); + vcgt = cmsReadTag (priv->lcms_profile, cmsSigVcgtType); if (vcgt == NULL || vcgt[0] == NULL) { g_set_error_literal (error, CD_ICC_ERROR, @@ -3270,7 +3299,7 @@ GPtrArray * cd_icc_get_response (CdIcc *icc, guint size, GError **error) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); CdColorRGB *data; CdColorspace colorspace; cmsHPROFILE srgb_profile = NULL; @@ -3281,8 +3310,8 @@ gfloat divamount; GPtrArray *array = NULL; guint i; - _cleanup_free_ gdouble *values_in = NULL; - _cleanup_free_ gdouble *values_out = NULL; + g_autofree gdouble *values_in = NULL; + g_autofree gdouble *values_out = NULL; /* run through the icc */ colorspace = cd_icc_get_colorspace (icc); @@ -3320,7 +3349,7 @@ values_out = g_new0 (gdouble, size * 3 * component_width); srgb_profile = cmsCreate_sRGBProfileTHR (priv->context_lcms); transform = cmsCreateTransformTHR (priv->context_lcms, - icc->priv->lcms_profile, TYPE_RGB_DBL, + priv->lcms_profile, TYPE_RGB_DBL, srgb_profile, TYPE_RGB_DBL, INTENT_PERCEPTUAL, 0); if (transform == NULL) { @@ -3373,16 +3402,17 @@ gboolean cd_icc_set_vcgt (CdIcc *icc, GPtrArray *vcgt, GError **error) { + CdIccPrivate *priv = GET_PRIVATE (icc); CdColorRGB *tmp; cmsToneCurve *curve[3]; gboolean ret; guint i; - _cleanup_free_ guint16 *blue = NULL; - _cleanup_free_ guint16 *green = NULL; - _cleanup_free_ guint16 *red = NULL; + g_autofree guint16 *blue = NULL; + g_autofree guint16 *green = NULL; + g_autofree guint16 *red = NULL; g_return_val_if_fail (CD_IS_ICC (icc), FALSE); - g_return_val_if_fail (icc->priv->lcms_profile != NULL, FALSE); + g_return_val_if_fail (priv->lcms_profile != NULL, FALSE); /* unwrap data */ red = g_new0 (guint16, vcgt->len); @@ -3405,7 +3435,7 @@ cmsSmoothToneCurve (curve[i], 5); /* write the tag */ - ret = cmsWriteTag (icc->priv->lcms_profile, cmsSigVcgtType, curve); + ret = cmsWriteTag (priv->lcms_profile, cmsSigVcgtType, curve); if (!ret) { g_set_error_literal (error, CD_ICC_ERROR, @@ -3425,7 +3455,8 @@ static CdProfileWarning cd_icc_check_whitepoint (CdIcc *icc) { - guint temp = icc->priv->temperature; + CdIccPrivate *priv = GET_PRIVATE (icc); + guint temp = priv->temperature; /* not set */ if (temp == 0) @@ -3444,7 +3475,7 @@ static CdProfileWarning cd_icc_check_vcgt (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsFloat32Number in; cmsFloat32Number now[3]; cmsFloat32Number previous[3] = { -1, -1, -1}; @@ -3483,7 +3514,7 @@ static CdProfileWarning cd_profile_check_scum_dot (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); CdProfileWarning warning = CD_PROFILE_WARNING_NONE; cmsCIELab white; cmsHPROFILE profile_lab; @@ -3523,7 +3554,7 @@ static CdProfileWarning cd_icc_check_primaries (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); cmsCIEXYZ *tmp; /* The values used to check are based on the following ultra-wide @@ -3570,7 +3601,7 @@ static CdProfileWarning cd_icc_check_gray_axis (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); CdProfileWarning warning = CD_PROFILE_WARNING_NONE; cmsCIELab gray[16]; cmsHPROFILE profile_lab = NULL; @@ -3637,7 +3668,7 @@ static CdProfileWarning cd_icc_check_d50_whitepoint (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); CdProfileWarning warning = CD_PROFILE_WARNING_NONE; cmsCIExyY tmp; cmsCIEXYZ additive; @@ -3748,7 +3779,7 @@ GArray * cd_icc_get_warnings (CdIcc *icc) { - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); GArray *flags; gboolean ret; gchar ascii_name[1024]; @@ -3820,7 +3851,7 @@ cd_icc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { CdIcc *icc = CD_ICC (object); - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); switch (prop_id) { case PROP_SIZE: @@ -3996,8 +4027,6 @@ 0, G_MAXUINT, 0, G_PARAM_READABLE); g_object_class_install_property (object_class, PROP_TEMPERATURE, pspec); - - g_type_class_add_private (klass, sizeof (CdIccPrivate)); } /** @@ -4007,26 +4036,26 @@ cd_icc_init (CdIcc *icc) { guint i; + CdIccPrivate *priv = GET_PRIVATE (icc); - icc->priv = CD_ICC_GET_PRIVATE (icc); - icc->priv->context_lcms = cd_context_lcms_new (); - icc->priv->kind = CD_PROFILE_KIND_UNKNOWN; - icc->priv->colorspace = CD_COLORSPACE_UNKNOWN; - icc->priv->named_colors = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_color_swatch_free); - icc->priv->metadata = g_hash_table_new_full (g_str_hash, + priv->context_lcms = cd_context_lcms_new (); + priv->kind = CD_PROFILE_KIND_UNKNOWN; + priv->colorspace = CD_COLORSPACE_UNKNOWN; + priv->named_colors = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_color_swatch_free); + priv->metadata = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); for (i = 0; i < CD_MLUC_LAST; i++) { - icc->priv->mluc_data[i] = g_hash_table_new_full (g_str_hash, + priv->mluc_data[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); } - cd_color_xyz_clear (&icc->priv->white); - cd_color_xyz_clear (&icc->priv->red); - cd_color_xyz_clear (&icc->priv->green); - cd_color_xyz_clear (&icc->priv->blue); + cd_color_xyz_clear (&priv->white); + cd_color_xyz_clear (&priv->red); + cd_color_xyz_clear (&priv->green); + cd_color_xyz_clear (&priv->blue); } /** @@ -4036,7 +4065,7 @@ cd_icc_finalize (GObject *object) { CdIcc *icc = CD_ICC (object); - CdIccPrivate *priv = icc->priv; + CdIccPrivate *priv = GET_PRIVATE (icc); guint i; g_free (priv->filename); diff -Nru colord-1.2.12/lib/colord/cd-icc.h colord-1.3.2/lib/colord/cd-icc.h --- colord-1.2.12/lib/colord/cd-icc.h 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-icc.h 2015-10-13 15:24:13.000000000 +0000 @@ -35,22 +35,11 @@ G_BEGIN_DECLS -#define CD_TYPE_ICC (cd_icc_get_type ()) -#define CD_ICC(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_ICC, CdIcc)) -#define CD_ICC_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_ICC, CdIccClass)) -#define CD_IS_ICC(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_ICC)) -#define CD_IS_ICC_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_ICC)) -#define CD_ICC_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_ICC, CdIccClass)) #define CD_ICC_ERROR (cd_icc_error_quark ()) #define CD_ICC_TYPE_ERROR (cd_icc_error_get_type ()) -typedef struct _CdIccPrivate CdIccPrivate; - -typedef struct -{ - GObject parent; - CdIccPrivate *priv; -} CdIcc; +#define CD_TYPE_ICC (cd_icc_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdIcc, cd_icc, CD, ICC, GObject) /** * CdIccError: @@ -80,7 +69,7 @@ CD_ICC_ERROR_LAST } CdIccError; -typedef struct +struct _CdIccClass { GObjectClass parent_class; /*< private >*/ @@ -93,7 +82,7 @@ void (*_cd_icc_reserved6) (void); void (*_cd_icc_reserved7) (void); void (*_cd_icc_reserved8) (void); -} CdIccClass; +}; /** * CdIccLoadFlags: @@ -138,7 +127,6 @@ CD_ICC_SAVE_FLAGS_LAST } CdIccSaveFlags; -GType cd_icc_get_type (void); GQuark cd_icc_error_quark (void); CdIcc *cd_icc_new (void); diff -Nru colord-1.2.12/lib/colord/cd-icc-store.c colord-1.3.2/lib/colord/cd-icc-store.c --- colord-1.2.12/lib/colord/cd-icc-store.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-icc-store.c 2015-10-13 15:24:13.000000000 +0000 @@ -29,20 +29,19 @@ #include #include -#include "cd-cleanup.h" #include "cd-icc-store.h" static void cd_icc_store_finalize (GObject *object); -#define CD_ICC_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_ICC_STORE, CdIccStorePrivate)) +#define GET_PRIVATE(o) (cd_icc_store_get_instance_private (o)) -struct _CdIccStorePrivate +typedef struct { CdIccLoadFlags load_flags; GPtrArray *directory_array; GPtrArray *icc_array; GResource *cache; -}; +} CdIccStorePrivate; enum { SIGNAL_ADDED, @@ -52,7 +51,7 @@ static guint signals[SIGNAL_LAST] = { 0 }; -G_DEFINE_TYPE (CdIccStore, cd_icc_store, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdIccStore, cd_icc_store, G_TYPE_OBJECT) #define CD_ICC_STORE_MAX_RECURSION_LEVELS 2 @@ -101,9 +100,10 @@ CdIcc * cd_icc_store_find_by_filename (CdIccStore *store, const gchar *filename) { + CdIccStorePrivate *priv = GET_PRIVATE (store); CdIcc *tmp; guint i; - GPtrArray *array = store->priv->icc_array; + GPtrArray *array = priv->icc_array; g_return_val_if_fail (CD_IS_ICC_STORE (store), NULL); g_return_val_if_fail (filename != NULL, NULL); @@ -130,9 +130,10 @@ CdIcc * cd_icc_store_find_by_checksum (CdIccStore *store, const gchar *checksum) { + CdIccStorePrivate *priv = GET_PRIVATE (store); CdIcc *tmp; guint i; - GPtrArray *array = store->priv->icc_array; + GPtrArray *array = priv->icc_array; g_return_val_if_fail (CD_IS_ICC_STORE (store), NULL); g_return_val_if_fail (checksum != NULL, NULL); @@ -151,9 +152,10 @@ static CdIccStoreDirHelper * cd_icc_store_find_by_directory (CdIccStore *store, const gchar *path) { + CdIccStorePrivate *priv = GET_PRIVATE (store); CdIccStoreDirHelper *tmp; guint i; - GPtrArray *array = store->priv->directory_array; + GPtrArray *array = priv->directory_array; for (i = 0; i < array->len; i++) { tmp = g_ptr_array_index (array, i); @@ -169,7 +171,8 @@ static gboolean cd_icc_store_remove_icc (CdIccStore *store, const gchar *filename) { - _cleanup_object_unref_ CdIcc *icc = NULL; + CdIccStorePrivate *priv = GET_PRIVATE (store); + g_autoptr(CdIcc) icc = NULL; /* find exact pointer */ icc = cd_icc_store_find_by_filename (store, filename); @@ -177,7 +180,7 @@ return FALSE; /* we have a ref so we can emit the signal */ - if (!g_ptr_array_remove (store->priv->icc_array, icc)) { + if (!g_ptr_array_remove (priv->icc_array, icc)) { g_warning ("failed to remove %s", filename); return FALSE; } @@ -193,23 +196,23 @@ static gboolean cd_icc_store_add_icc (CdIccStore *store, GFile *file, GError **error) { - CdIccStorePrivate *priv = store->priv; - _cleanup_bytes_unref_ GBytes *data = NULL; - _cleanup_free_ gchar *filename = NULL; - _cleanup_object_unref_ CdIcc *icc = NULL; - _cleanup_object_unref_ CdIcc *icc_tmp = NULL; + CdIccStorePrivate *priv = GET_PRIVATE (store); + g_autoptr(GBytes) data = NULL; + g_autofree gchar *filename = NULL; + g_autoptr(CdIcc) icc = NULL; + g_autoptr(CdIcc) icc_tmp = NULL; /* use the GResource cache if available */ icc = cd_icc_new (); filename = g_file_get_path (file); - if (store->priv->cache != NULL) { + if (priv->cache != NULL) { if (g_str_has_prefix (filename, "/usr/share/color/icc/colord/")) { - _cleanup_free_ gchar *cache_key = NULL; + g_autofree gchar *cache_key = NULL; cache_key = g_build_filename ("/org/freedesktop/colord", "profiles", filename + 28, NULL); - data = g_resource_lookup_data (store->priv->cache, + data = g_resource_lookup_data (priv->cache, cache_key, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL); @@ -218,7 +221,7 @@ /* parse new icc object */ if (data != NULL) { - _cleanup_free_ gchar *basename = NULL; + g_autofree gchar *basename = NULL; basename = g_path_get_basename (filename); g_debug ("Using built-in %s", basename); cd_icc_set_filename (icc, filename); @@ -232,7 +235,7 @@ } else { if (!cd_icc_load_file (icc, file, - store->priv->load_flags, + priv->load_flags, NULL, error)) { return FALSE; @@ -269,10 +272,10 @@ CdIccStore *store = CD_ICC_STORE (user_data); GFile *file = G_FILE (source_object); gboolean ret; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *path = NULL; - _cleanup_object_unref_ GFileInfo *info = NULL; - _cleanup_object_unref_ GFile *parent = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *path = NULL; + g_autoptr(GFileInfo) info = NULL; + g_autoptr(GFile) parent = NULL; info = g_file_query_info_finish (file, res, NULL); if (info == NULL) @@ -291,7 +294,7 @@ static void cd_icc_store_remove_from_prefix (CdIccStore *store, const gchar *prefix) { - CdIccStorePrivate *priv = store->priv; + CdIccStorePrivate *priv = GET_PRIVATE (store); CdIcc *tmp; const gchar *filename; guint i; @@ -316,9 +319,10 @@ GFileMonitorEvent event_type, CdIccStore *store) { + CdIccStorePrivate *priv = GET_PRIVATE (store); CdIcc *tmp; CdIccStoreDirHelper *helper; - _cleanup_free_ gchar *path = NULL; + g_autofree gchar *path = NULL; /* icc was deleted */ if (event_type == G_FILE_MONITOR_EVENT_DELETED) { @@ -338,7 +342,7 @@ cd_icc_store_remove_from_prefix (store, path); helper = cd_icc_store_find_by_directory (store, path); if (helper != NULL) { - g_ptr_array_remove (store->priv->directory_array, + g_ptr_array_remove (priv->directory_array, helper); } return; @@ -379,8 +383,8 @@ { const gchar *name; const gchar *type; - _cleanup_free_ gchar *full_path = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autofree gchar *full_path = NULL; + g_autoptr(GFile) file = NULL; /* further down the worm-hole */ name = g_file_info_get_name (info); @@ -421,12 +425,13 @@ GCancellable *cancellable, GError **error) { + CdIccStorePrivate *priv = GET_PRIVATE (store); CdIccStoreDirHelper *helper; GError *error_local = NULL; gboolean ret = TRUE; - _cleanup_object_unref_ GFileEnumerator *enumerator = NULL; - _cleanup_object_unref_ GFile *file = NULL; - _cleanup_object_unref_ GFileInfo *info = NULL; + g_autoptr(GFileEnumerator) enumerator = NULL; + g_autoptr(GFile) file = NULL; + g_autoptr(GFileInfo) info = NULL; /* check sanity */ if (depth > CD_ICC_STORE_MAX_RECURSION_LEVELS) { @@ -457,7 +462,7 @@ g_signal_connect (helper->monitor, "changed", G_CALLBACK(cd_icc_store_file_monitor_changed_cb), store); - g_ptr_array_add (store->priv->directory_array, helper); + g_ptr_array_add (priv->directory_array, helper); } /* get contents of directory */ @@ -472,7 +477,7 @@ ret = FALSE; helper = cd_icc_store_find_by_directory (store, path); if (helper != NULL) - g_ptr_array_remove (store->priv->directory_array, helper); + g_ptr_array_remove (priv->directory_array, helper); goto out; } @@ -518,8 +523,9 @@ void cd_icc_store_set_load_flags (CdIccStore *store, CdIccLoadFlags load_flags) { + CdIccStorePrivate *priv = GET_PRIVATE (store); g_return_if_fail (CD_IS_ICC_STORE (store)); - store->priv->load_flags = load_flags | CD_ICC_LOAD_FLAGS_FALLBACK_MD5; + priv->load_flags = load_flags | CD_ICC_LOAD_FLAGS_FALLBACK_MD5; } /** @@ -535,8 +541,9 @@ CdIccLoadFlags cd_icc_store_get_load_flags (CdIccStore *store) { + CdIccStorePrivate *priv = GET_PRIVATE (store); g_return_val_if_fail (CD_IS_ICC_STORE (store), 0); - return store->priv->load_flags; + return priv->load_flags; } /** @@ -552,9 +559,10 @@ void cd_icc_store_set_cache (CdIccStore *store, GResource *cache) { + CdIccStorePrivate *priv = GET_PRIVATE (store); g_return_if_fail (CD_IS_ICC_STORE (store)); - g_return_if_fail (store->priv->cache == NULL); - store->priv->cache = g_resource_ref (cache); + g_return_if_fail (priv->cache == NULL); + priv->cache = g_resource_ref (cache); } /** @@ -570,8 +578,9 @@ GPtrArray * cd_icc_store_get_all (CdIccStore *store) { + CdIccStorePrivate *priv = GET_PRIVATE (store); g_return_val_if_fail (CD_IS_ICC_STORE (store), NULL); - return g_ptr_array_ref (store->priv->icc_array); + return g_ptr_array_ref (priv->icc_array); } /** @@ -597,7 +606,7 @@ { gchar *tmp; guint i; - _cleanup_ptrarray_unref_ GPtrArray *locations = NULL; + g_autoptr(GPtrArray) locations = NULL; g_return_val_if_fail (CD_IS_ICC_STORE (store), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -661,7 +670,7 @@ GCancellable *cancellable, GError **error) { - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GFile) file = NULL; g_return_val_if_fail (CD_IS_ICC_STORE (store), FALSE); g_return_val_if_fail (location != NULL, FALSE); @@ -722,8 +731,6 @@ G_STRUCT_OFFSET (CdIccStoreClass, removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, CD_TYPE_ICC); - - g_type_class_add_private (klass, sizeof (CdIccStorePrivate)); } /** @@ -732,10 +739,10 @@ static void cd_icc_store_init (CdIccStore *store) { - store->priv = CD_ICC_STORE_GET_PRIVATE (store); - store->priv->load_flags = CD_ICC_LOAD_FLAGS_FALLBACK_MD5; - store->priv->icc_array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - store->priv->directory_array = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_icc_store_helper_free); + CdIccStorePrivate *priv = GET_PRIVATE (store); + priv->load_flags = CD_ICC_LOAD_FLAGS_FALLBACK_MD5; + priv->icc_array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); + priv->directory_array = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_icc_store_helper_free); } /** @@ -745,7 +752,7 @@ cd_icc_store_finalize (GObject *object) { CdIccStore *store = CD_ICC_STORE (object); - CdIccStorePrivate *priv = store->priv; + CdIccStorePrivate *priv = GET_PRIVATE (store); g_ptr_array_unref (priv->icc_array); g_ptr_array_unref (priv->directory_array); diff -Nru colord-1.2.12/lib/colord/cd-icc-store.h colord-1.3.2/lib/colord/cd-icc-store.h --- colord-1.2.12/lib/colord/cd-icc-store.h 2015-05-01 13:55:26.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-icc-store.h 2015-10-13 15:24:13.000000000 +0000 @@ -32,22 +32,8 @@ G_BEGIN_DECLS -#define CD_TYPE_ICC_STORE (cd_icc_store_get_type ()) -#define CD_ICC_STORE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_ICC_STORE, CdIccStore)) -#define CD_ICC_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_ICC_STORE, CdIccStoreClass)) -#define CD_IS_ICC_STORE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_ICC_STORE)) -#define CD_IS_ICC_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_ICC_STORE)) -#define CD_ICC_STORE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_ICC_STORE, CdIccStoreClass)) - -typedef struct _CdIccStorePrivate CdIccStorePrivate; -typedef struct _CdIccStore CdIccStore; -typedef struct _CdIccStoreClass CdIccStoreClass; - -struct _CdIccStore -{ - GObject parent; - CdIccStorePrivate *priv; -}; +#define CD_TYPE_ICC_STORE (cd_icc_store_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdIccStore, cd_icc_store, CD, ICC_STORE, GObject) struct _CdIccStoreClass { @@ -90,7 +76,6 @@ CD_ICC_STORE_SEARCH_KIND_LAST } CdIccStoreSearchKind; -GType cd_icc_store_get_type (void); CdIccStore *cd_icc_store_new (void); gboolean cd_icc_store_search_location (CdIccStore *store, const gchar *location, diff -Nru colord-1.2.12/lib/colord/cd-icc-utils.c colord-1.3.2/lib/colord/cd-icc-utils.c --- colord-1.2.12/lib/colord/cd-icc-utils.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-icc-utils.c 2015-10-13 15:24:13.000000000 +0000 @@ -31,7 +31,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-icc-utils.h" typedef struct { @@ -72,8 +71,8 @@ guint cnt = 0; guint data_len = cube_size * cube_size * cube_size; guint i; - _cleanup_free_ cmsFloat32Number *data = NULL; - _cleanup_free_ cmsUInt16Number *alarm_codes = NULL; + g_autofree cmsFloat32Number *data = NULL; + g_autofree cmsUInt16Number *alarm_codes = NULL; /* create a proofing transform with gamut check */ profile_null = cmsCreateNULLProfileTHR (cd_icc_get_context (icc)); diff -Nru colord-1.2.12/lib/colord/cd-interp-akima.c colord-1.3.2/lib/colord/cd-interp-akima.c --- colord-1.2.12/lib/colord/cd-interp-akima.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-interp-akima.c 2015-10-13 15:24:13.000000000 +0000 @@ -31,28 +31,27 @@ #include #include -#include "cd-cleanup.h" #include "cd-interp-akima.h" static void cd_interp_akima_class_init (CdInterpAkimaClass *klass); static void cd_interp_akima_init (CdInterpAkima *interp_akima); static void cd_interp_akima_finalize (GObject *object); -#define CD_INTERP_AKIMA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_INTERP_AKIMA, CdInterpAkimaPrivate)) +#define GET_PRIVATE(o) (cd_interp_akima_get_instance_private (o)) /** * CdInterpAkimaPrivate: * * Private #CdInterpAkima data **/ -struct _CdInterpAkimaPrivate +typedef struct { gdouble *slope_t; /* slope */ gdouble *polynom_c; /* coefficient C */ gdouble *polynom_d; /* coefficient D */ -}; +} CdInterpAkimaPrivate; -G_DEFINE_TYPE (CdInterpAkima, cd_interp_akima, CD_TYPE_INTERP) +G_DEFINE_TYPE_WITH_PRIVATE (CdInterpAkima, cd_interp_akima, CD_TYPE_INTERP) /** * cd_interp_akima_prepare: @@ -61,7 +60,7 @@ cd_interp_akima_prepare (CdInterp *interp, GError **error) { CdInterpAkima *interp_akima = CD_INTERP_AKIMA (interp); - CdInterpAkimaPrivate *priv = interp_akima->priv; + CdInterpAkimaPrivate *priv = GET_PRIVATE (interp_akima); gdouble tmp = 0.0; gdouble *x; gdouble *y; @@ -69,9 +68,9 @@ gint n; GArray *array_x; GArray *array_y; - _cleanup_free_ gdouble *dx = NULL; - _cleanup_free_ gdouble *dy = NULL; - _cleanup_free_ gdouble *slope_m = NULL; + g_autofree gdouble *dx = NULL; + g_autofree gdouble *dy = NULL; + g_autofree gdouble *slope_m = NULL; /* only add the points if they are going to be used */ if (cd_interp_get_size (interp) <= 2) @@ -162,7 +161,7 @@ cd_interp_akima_eval (CdInterp *interp, gdouble value, GError **error) { CdInterpAkima *interp_akima = CD_INTERP_AKIMA (interp); - CdInterpAkimaPrivate *priv = interp_akima->priv; + CdInterpAkimaPrivate *priv = GET_PRIVATE (interp_akima); const gdouble *x; const gdouble *y; gdouble result; @@ -193,8 +192,6 @@ interp_class->prepare = cd_interp_akima_prepare; interp_class->eval = cd_interp_akima_eval; object_class->finalize = cd_interp_akima_finalize; - - g_type_class_add_private (klass, sizeof (CdInterpAkimaPrivate)); } /** @@ -203,7 +200,6 @@ static void cd_interp_akima_init (CdInterpAkima *interp_akima) { - interp_akima->priv = CD_INTERP_AKIMA_GET_PRIVATE (interp_akima); } /** @@ -213,12 +209,13 @@ cd_interp_akima_finalize (GObject *object) { CdInterpAkima *interp_akima = CD_INTERP_AKIMA (object); + CdInterpAkimaPrivate *priv = GET_PRIVATE (interp_akima); g_return_if_fail (CD_IS_INTERP_AKIMA (object)); - g_free (interp_akima->priv->slope_t); - g_free (interp_akima->priv->polynom_c); - g_free (interp_akima->priv->polynom_d); + g_free (priv->slope_t); + g_free (priv->polynom_c); + g_free (priv->polynom_d); G_OBJECT_CLASS (cd_interp_akima_parent_class)->finalize (object); } diff -Nru colord-1.2.12/lib/colord/cd-interp-akima.h colord-1.3.2/lib/colord/cd-interp-akima.h --- colord-1.2.12/lib/colord/cd-interp-akima.h 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-interp-akima.h 2015-10-13 15:24:13.000000000 +0000 @@ -31,27 +31,14 @@ G_BEGIN_DECLS -#define CD_TYPE_INTERP_AKIMA (cd_interp_akima_get_type ()) -#define CD_INTERP_AKIMA(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_INTERP_AKIMA, CdInterpAkima)) -#define CD_INTERP_AKIMA_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_INTERP_AKIMA, CdInterpAkimaClass)) -#define CD_IS_INTERP_AKIMA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_INTERP_AKIMA)) -#define CD_IS_INTERP_AKIMA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_INTERP_AKIMA)) -#define CD_INTERP_AKIMA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_INTERP_AKIMA, CdInterpAkimaClass)) +#define CD_TYPE_INTERP_AKIMA (cd_interp_akima_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdInterpAkima, cd_interp_akima, CD, INTERP_AKIMA, CdInterp) -typedef struct _CdInterpAkimaPrivate CdInterpAkimaPrivate; - -typedef struct -{ - CdInterp parent; - CdInterpAkimaPrivate *priv; -} CdInterpAkima; - -typedef struct +struct _CdInterpAkimaClass { CdInterpClass parent_class; -} CdInterpAkimaClass; +}; -GType cd_interp_akima_get_type (void); CdInterp *cd_interp_akima_new (void); G_END_DECLS diff -Nru colord-1.2.12/lib/colord/cd-interp.c colord-1.3.2/lib/colord/cd-interp.c --- colord-1.2.12/lib/colord/cd-interp.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-interp.c 2015-10-13 15:24:13.000000000 +0000 @@ -36,21 +36,21 @@ static void cd_interp_init (CdInterp *interp); static void cd_interp_finalize (GObject *object); -#define CD_INTERP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_INTERP, CdInterpPrivate)) +#define GET_PRIVATE(o) (cd_interp_get_instance_private (o)) /** * CdInterpPrivate: * * Private #CdInterp data **/ -struct _CdInterpPrivate +typedef struct { CdInterpKind kind; GArray *x; GArray *y; gboolean prepared; guint size; -}; +} CdInterpPrivate; enum { PROP_0, @@ -58,7 +58,7 @@ PROP_LAST }; -G_DEFINE_TYPE (CdInterp, cd_interp, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdInterp, cd_interp, G_TYPE_OBJECT) /** * cd_interp_error_quark: @@ -95,8 +95,9 @@ GArray * cd_interp_get_x (CdInterp *interp) { + CdInterpPrivate *priv = GET_PRIVATE (interp); g_return_val_if_fail (CD_IS_INTERP (interp), NULL); - return interp->priv->x; + return priv->x; } /** @@ -118,8 +119,9 @@ GArray * cd_interp_get_y (CdInterp *interp) { + CdInterpPrivate *priv = GET_PRIVATE (interp); g_return_val_if_fail (CD_IS_INTERP (interp), NULL); - return interp->priv->y; + return priv->y; } /** @@ -140,8 +142,9 @@ guint cd_interp_get_size (CdInterp *interp) { + CdInterpPrivate *priv = GET_PRIVATE (interp); g_return_val_if_fail (CD_IS_INTERP (interp), 0); - return interp->priv->size; + return priv->size; } /** @@ -157,10 +160,11 @@ void cd_interp_insert (CdInterp *interp, gdouble x, gdouble y) { + CdInterpPrivate *priv = GET_PRIVATE (interp); g_return_if_fail (CD_IS_INTERP (interp)); - g_return_if_fail (!interp->priv->prepared); - g_array_append_val (interp->priv->x, x); - g_array_append_val (interp->priv->y, y); + g_return_if_fail (!priv->prepared); + g_array_append_val (priv->x, x); + g_array_append_val (priv->y, y); } /** @@ -176,15 +180,16 @@ gboolean cd_interp_prepare (CdInterp *interp, GError **error) { + CdInterpPrivate *priv = GET_PRIVATE (interp); CdInterpClass *klass = CD_INTERP_GET_CLASS (interp); g_return_val_if_fail (CD_IS_INTERP (interp), FALSE); - g_return_val_if_fail (!interp->priv->prepared, FALSE); + g_return_val_if_fail (!priv->prepared, FALSE); /* save number of data points before the klass method messes around * with them */ - interp->priv->size = interp->priv->x->len; - if (interp->priv->size == 0) { + priv->size = priv->x->len; + if (priv->size == 0) { g_set_error_literal (error, CD_INTERP_ERROR, CD_INTERP_ERROR_FAILED, @@ -199,7 +204,7 @@ } /* success */ - interp->priv->prepared = TRUE; + priv->prepared = TRUE; return TRUE; } @@ -221,7 +226,7 @@ cd_interp_eval (CdInterp *interp, gdouble value, GError **error) { CdInterpClass *klass = CD_INTERP_GET_CLASS (interp); - CdInterpPrivate *priv = interp->priv; + CdInterpPrivate *priv = GET_PRIVATE (interp); const gdouble *x; const gdouble *y; @@ -273,8 +278,9 @@ CdInterpKind cd_interp_get_kind (CdInterp *interp) { + CdInterpPrivate *priv = GET_PRIVATE (interp); g_return_val_if_fail (CD_IS_INTERP (interp), CD_INTERP_KIND_LAST); - return interp->priv->kind; + return priv->kind; } /** @@ -300,10 +306,11 @@ GParamSpec *pspec) { CdInterp *interp = CD_INTERP (object); + CdInterpPrivate *priv = GET_PRIVATE (interp); switch (prop_id) { case PROP_KIND: - g_value_set_uint (value, interp->priv->kind); + g_value_set_uint (value, priv->kind); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -322,10 +329,11 @@ GParamSpec *pspec) { CdInterp *interp = CD_INTERP (object); + CdInterpPrivate *priv = GET_PRIVATE (interp); switch (prop_id) { case PROP_KIND: - interp->priv->kind = g_value_get_uint (value); + priv->kind = g_value_get_uint (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -358,8 +366,6 @@ NULL, NULL, 0, G_MAXUINT, 0, G_PARAM_READWRITE)); - - g_type_class_add_private (klass, sizeof (CdInterpPrivate)); } /** @@ -368,9 +374,9 @@ static void cd_interp_init (CdInterp *interp) { - interp->priv = CD_INTERP_GET_PRIVATE (interp); - interp->priv->x = g_array_new (FALSE, TRUE, sizeof (gdouble)); - interp->priv->y = g_array_new (FALSE, TRUE, sizeof (gdouble)); + CdInterpPrivate *priv = GET_PRIVATE (interp); + priv->x = g_array_new (FALSE, TRUE, sizeof (gdouble)); + priv->y = g_array_new (FALSE, TRUE, sizeof (gdouble)); } /** @@ -380,11 +386,12 @@ cd_interp_finalize (GObject *object) { CdInterp *interp = CD_INTERP (object); + CdInterpPrivate *priv = GET_PRIVATE (interp); g_return_if_fail (CD_IS_INTERP (object)); - g_array_unref (interp->priv->x); - g_array_unref (interp->priv->y); + g_array_unref (priv->x); + g_array_unref (priv->y); G_OBJECT_CLASS (cd_interp_parent_class)->finalize (object); } diff -Nru colord-1.2.12/lib/colord/cd-interp.h colord-1.3.2/lib/colord/cd-interp.h --- colord-1.2.12/lib/colord/cd-interp.h 2015-05-01 13:55:26.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-interp.h 2015-10-13 15:24:13.000000000 +0000 @@ -30,24 +30,13 @@ G_BEGIN_DECLS -#define CD_TYPE_INTERP (cd_interp_get_type ()) -#define CD_INTERP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_INTERP, CdInterp)) -#define CD_INTERP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_INTERP, CdInterpClass)) -#define CD_IS_INTERP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_INTERP)) -#define CD_IS_INTERP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_INTERP)) -#define CD_INTERP_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_INTERP, CdInterpClass)) #define CD_INTERP_ERROR (cd_interp_error_quark ()) #define CD_INTERP_TYPE_ERROR (cd_interp_error_get_type ()) -typedef struct _CdInterpPrivate CdInterpPrivate; +#define CD_TYPE_INTERP (cd_interp_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdInterp, cd_interp, CD, INTERP, GObject) -typedef struct -{ - GObject parent; - CdInterpPrivate *priv; -} CdInterp; - -typedef struct +struct _CdInterpClass { GObjectClass parent_class; /*< private >*/ @@ -67,7 +56,7 @@ void (*_cd_interp_reserved6) (void); void (*_cd_interp_reserved7) (void); void (*_cd_interp_reserved8) (void); -} CdInterpClass; +}; /** * CdInterpError: @@ -94,7 +83,6 @@ CD_INTERP_KIND_LAST } CdInterpKind; -GType cd_interp_get_type (void); GQuark cd_interp_error_quark (void); CdInterpKind cd_interp_get_kind (CdInterp *interp); diff -Nru colord-1.2.12/lib/colord/cd-interp-linear.h colord-1.3.2/lib/colord/cd-interp-linear.h --- colord-1.2.12/lib/colord/cd-interp-linear.h 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-interp-linear.h 2015-10-13 15:24:13.000000000 +0000 @@ -31,27 +31,14 @@ G_BEGIN_DECLS -#define CD_TYPE_INTERP_LINEAR (cd_interp_linear_get_type ()) -#define CD_INTERP_LINEAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_INTERP_LINEAR, CdInterpLinear)) -#define CD_INTERP_LINEAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_INTERP_LINEAR, CdInterpLinearClass)) -#define CD_IS_INTERP_LINEAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_INTERP_LINEAR)) -#define CD_IS_INTERP_LINEAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_INTERP_LINEAR)) -#define CD_INTERP_LINEAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_INTERP_LINEAR, CdInterpLinearClass)) +#define CD_TYPE_INTERP_LINEAR (cd_interp_linear_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdInterpLinear, cd_interp_linear, CD, INTERP_LINEAR, CdInterp) -typedef struct _CdInterpLinearPrivate CdInterpLinearPrivate; - -typedef struct -{ - CdInterp parent; - CdInterpLinearPrivate *priv; -} CdInterpLinear; - -typedef struct +struct _CdInterpLinearClass { CdInterpClass parent_class; -} CdInterpLinearClass; +}; -GType cd_interp_linear_get_type (void); CdInterp *cd_interp_linear_new (void); G_END_DECLS diff -Nru colord-1.2.12/lib/colord/cd-it8.c colord-1.3.2/lib/colord/cd-it8.c --- colord-1.2.12/lib/colord/cd-it8.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-it8.c 2016-03-03 09:39:04.000000000 +0000 @@ -35,7 +35,6 @@ #include #include "cd-it8.h" -#include "cd-cleanup.h" #include "cd-color.h" #include "cd-context-lcms.h" @@ -43,14 +42,14 @@ static void cd_it8_init (CdIt8 *it8); static void cd_it8_finalize (GObject *object); -#define CD_IT8_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_IT8, CdIt8Private)) +#define GET_PRIVATE(o) (cd_it8_get_instance_private (o)) /** * CdIt8Private: * * Private #CdIt8 data **/ -struct _CdIt8Private +typedef struct { CdIt8Kind kind; cmsContext context_lcms; @@ -66,7 +65,7 @@ GPtrArray *array_rgb; GPtrArray *array_xyz; GPtrArray *options; -}; +} CdIt8Private; enum { PROP_0, @@ -80,7 +79,7 @@ PROP_LAST }; -G_DEFINE_TYPE (CdIt8, cd_it8, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdIt8, cd_it8, G_TYPE_OBJECT) /** * cd_it8_error_quark: @@ -226,8 +225,9 @@ void cd_it8_set_matrix (CdIt8 *it8, const CdMat3x3 *matrix) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - cd_mat33_copy (matrix, &it8->priv->matrix); + cd_mat33_copy (matrix, &priv->matrix); } /** @@ -243,8 +243,9 @@ const CdMat3x3 * cd_it8_get_matrix (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), NULL); - return &it8->priv->matrix; + return &priv->matrix; } /** @@ -259,8 +260,9 @@ void cd_it8_set_kind (CdIt8 *it8, CdIt8Kind kind) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - it8->priv->kind = kind; + priv->kind = kind; } /** @@ -276,8 +278,9 @@ CdIt8Kind cd_it8_get_kind (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), 0); - return it8->priv->kind; + return priv->kind; } /** @@ -286,7 +289,7 @@ static gboolean cd_it8_parse_luminance (const gchar *text, CdColorXYZ *xyz, GError **error) { - _cleanup_strv_free_ gchar **split = NULL; + g_auto(GStrv) split = NULL; split = g_strsplit (text, " ", -1); if (g_strv_length (split) != 3) { @@ -317,8 +320,9 @@ const gchar * cd_it8_get_originator (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), NULL); - return it8->priv->originator; + return priv->originator; } /** @@ -334,8 +338,9 @@ const gchar * cd_it8_get_title (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), NULL); - return it8->priv->title; + return priv->title; } /** @@ -351,8 +356,9 @@ const gchar * cd_it8_get_instrument (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), NULL); - return it8->priv->instrument; + return priv->instrument; } /** @@ -368,8 +374,9 @@ const gchar * cd_it8_get_reference (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), NULL); - return it8->priv->reference; + return priv->reference; } /** @@ -386,8 +393,9 @@ gboolean cd_it8_get_enable_created (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); - return it8->priv->enable_created; + return priv->enable_created; } /** @@ -403,8 +411,9 @@ gboolean cd_it8_get_normalized (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); - return it8->priv->normalized; + return priv->normalized; } /** @@ -420,8 +429,9 @@ gboolean cd_it8_get_spectral (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); - return it8->priv->spectral; + return priv->spectral; } /** @@ -430,6 +440,7 @@ static gboolean cd_it8_load_ti1_cal (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); CdColorRGB *rgb; CdColorXYZ *xyz; const gchar *tmp; @@ -464,16 +475,16 @@ /* ti1 files don't have NORMALIZED_TO_Y_100 so guess on * the asumption the first patch isn't black */ if (rgb->R > 1.0 || rgb->G > 1.0 || rgb->B > 1.0) - it8->priv->normalized = TRUE; - if (it8->priv->normalized) { + priv->normalized = TRUE; + if (priv->normalized) { rgb->R /= 100.0f; rgb->G /= 100.0f; rgb->B /= 100.0f; } - g_ptr_array_add (it8->priv->array_rgb, rgb); + g_ptr_array_add (priv->array_rgb, rgb); xyz = cd_color_xyz_new (); cd_color_xyz_set (xyz, 0.0, 0.0, 0.0); - g_ptr_array_add (it8->priv->array_xyz, xyz); + g_ptr_array_add (priv->array_xyz, xyz); } return TRUE; } @@ -484,6 +495,7 @@ static gboolean cd_it8_load_ti3 (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); CdColorRGB *rgb; CdColorXYZ luminance; CdColorXYZ *xyz; @@ -538,7 +550,7 @@ rgb->G /= 100.0f; rgb->B /= 100.0f; } - g_ptr_array_add (it8->priv->array_rgb, rgb); + g_ptr_array_add (priv->array_rgb, rgb); xyz = cd_color_xyz_new (); xyz->X = _cmsIT8GetDataRowColDbl (it8_lcms, i, 4); xyz->Y = _cmsIT8GetDataRowColDbl (it8_lcms, i, 5); @@ -551,7 +563,7 @@ xyz->Y *= luminance.Y; xyz->Z *= luminance.Z; } - g_ptr_array_add (it8->priv->array_xyz, xyz); + g_ptr_array_add (priv->array_xyz, xyz); } return TRUE; } @@ -562,6 +574,7 @@ static gboolean cd_it8_load_ccmx (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); const gchar *tmp; /* check color format */ @@ -578,15 +591,15 @@ cd_it8_set_instrument (it8, cmsIT8GetProperty (it8_lcms, "INSTRUMENT")); /* just load the matrix */ - it8->priv->matrix.m00 = _cmsIT8GetDataRowColDbl (it8_lcms, 0, 0); - it8->priv->matrix.m01 = _cmsIT8GetDataRowColDbl (it8_lcms, 0, 1); - it8->priv->matrix.m02 = _cmsIT8GetDataRowColDbl (it8_lcms, 0, 2); - it8->priv->matrix.m10 = _cmsIT8GetDataRowColDbl (it8_lcms, 1, 0); - it8->priv->matrix.m11 = _cmsIT8GetDataRowColDbl (it8_lcms, 1, 1); - it8->priv->matrix.m12 = _cmsIT8GetDataRowColDbl (it8_lcms, 1, 2); - it8->priv->matrix.m20 = _cmsIT8GetDataRowColDbl (it8_lcms, 2, 0); - it8->priv->matrix.m21 = _cmsIT8GetDataRowColDbl (it8_lcms, 2, 1); - it8->priv->matrix.m22 = _cmsIT8GetDataRowColDbl (it8_lcms, 2, 2); + priv->matrix.m00 = _cmsIT8GetDataRowColDbl (it8_lcms, 0, 0); + priv->matrix.m01 = _cmsIT8GetDataRowColDbl (it8_lcms, 0, 1); + priv->matrix.m02 = _cmsIT8GetDataRowColDbl (it8_lcms, 0, 2); + priv->matrix.m10 = _cmsIT8GetDataRowColDbl (it8_lcms, 1, 0); + priv->matrix.m11 = _cmsIT8GetDataRowColDbl (it8_lcms, 1, 1); + priv->matrix.m12 = _cmsIT8GetDataRowColDbl (it8_lcms, 1, 2); + priv->matrix.m20 = _cmsIT8GetDataRowColDbl (it8_lcms, 2, 0); + priv->matrix.m21 = _cmsIT8GetDataRowColDbl (it8_lcms, 2, 1); + priv->matrix.m22 = _cmsIT8GetDataRowColDbl (it8_lcms, 2, 2); return TRUE; } @@ -596,7 +609,6 @@ static gboolean cd_it8_load_ccss_spect (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { - CdSpectrum *spectrum; const gchar *tmp; gboolean has_index; gdouble spectral_end; @@ -682,12 +694,13 @@ return FALSE; } for (j = 0; j < (guint) number_of_sets; j++) { + g_autoptr(CdSpectrum) spectrum = NULL; spectrum = cd_spectrum_sized_new (spectral_bands); if (has_index) { cd_spectrum_set_id (spectrum, cmsIT8GetDataRowCol(it8_lcms, j, 0)); } else { - _cleanup_free_ gchar *label = NULL; + g_autofree gchar *label = NULL; label = g_strdup_printf ("%i", j + 1); cd_spectrum_set_id (spectrum, label); } @@ -699,7 +712,6 @@ cd_spectrum_set_end (spectrum, spectral_end); cd_spectrum_set_norm (spectrum, spectral_norm); cd_it8_add_spectrum (it8, spectrum); - cd_spectrum_free (spectrum); } return TRUE; } @@ -710,7 +722,6 @@ static gboolean cd_it8_load_cmf (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { - CdSpectrum *spectrum; gdouble spectral_end; gdouble spectral_norm; gdouble spectral_start; @@ -789,6 +800,7 @@ return FALSE; } for (j = 0; j < (guint) number_of_sets; j++) { + g_autoptr(CdSpectrum) spectrum = NULL; spectrum = cd_spectrum_sized_new (spectral_bands); if (j == 0) cd_spectrum_set_id (spectrum, "X"); @@ -804,7 +816,6 @@ cd_spectrum_set_end (spectrum, spectral_end); cd_spectrum_set_norm (spectrum, spectral_norm); cd_it8_add_spectrum (it8, spectrum); - cd_spectrum_free (spectrum); } return TRUE; } @@ -823,14 +834,15 @@ gboolean cd_it8_has_option (CdIt8 *it8, const gchar *option) { + CdIt8Private *priv = GET_PRIVATE (it8); const gchar *tmp; guint i; g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); g_return_val_if_fail (option != NULL, FALSE); - for (i = 0; i < it8->priv->options->len; i++) { - tmp = g_ptr_array_index (it8->priv->options, i); + for (i = 0; i < priv->options->len; i++) { + tmp = g_ptr_array_index (priv->options, i); if (g_strcmp0 (tmp, option) == 0) return TRUE; } @@ -856,27 +868,28 @@ gsize size, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); cmsHANDLE it8_lcms = NULL; const gchar *tmp; gboolean ret = TRUE; gchar **props = NULL; guint i; - _cleanup_error_free_ GError *error_local = NULL; + g_autoptr(GError) error_local = NULL; g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); g_return_val_if_fail (data != NULL, FALSE); g_return_val_if_fail (size > 0, FALSE); /* clear old data */ - g_ptr_array_set_size (it8->priv->array_rgb, 0); - g_ptr_array_set_size (it8->priv->array_xyz, 0); - g_ptr_array_set_size (it8->priv->options, 0); - cd_mat33_clear (&it8->priv->matrix); + g_ptr_array_set_size (priv->array_rgb, 0); + g_ptr_array_set_size (priv->array_xyz, 0); + g_ptr_array_set_size (priv->options, 0); + cd_mat33_clear (&priv->matrix); /* load the it8 data */ - it8_lcms = cmsIT8LoadFromMem (it8->priv->context_lcms, (void *) data, size); + it8_lcms = cmsIT8LoadFromMem (priv->context_lcms, (void *) data, size); if (it8_lcms == NULL) { - ret = cd_context_lcms_error_check (it8->priv->context_lcms, &error_local); + ret = cd_context_lcms_error_check (priv->context_lcms, &error_local); if (!ret) { g_set_error_literal (error, CD_IT8_ERROR, @@ -925,7 +938,7 @@ } /* get ti1 and ti3 specific data */ - switch (it8->priv->kind) { + switch (priv->kind) { case CD_IT8_KIND_TI1: case CD_IT8_KIND_CAL: ret = cd_it8_load_ti1_cal (it8, it8_lcms, error); @@ -983,7 +996,7 @@ cd_it8_load_from_file (CdIt8 *it8, GFile *file, GError **error) { gsize size = 0; - _cleanup_free_ gchar *data = NULL; + g_autofree gchar *data = NULL; g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -1032,6 +1045,7 @@ static gboolean cd_it8_save_to_file_ti1_ti3 (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); CdColorRGB *rgb_tmp; CdColorXYZ lumi_xyz; CdColorXYZ *xyz_tmp; @@ -1039,20 +1053,20 @@ gdouble normalize = 0.0f; guint i; guint luminance_samples = 0; - _cleanup_free_ gchar *lumi_str = NULL; + g_autofree gchar *lumi_str = NULL; /* calculate the absolute XYZ in candelas per meter squared */ cd_color_xyz_clear (&lumi_xyz); - if (it8->priv->normalized) { - for (i = 0; i < it8->priv->array_rgb->len; i++) { - rgb_tmp = g_ptr_array_index (it8->priv->array_rgb, i); + if (priv->normalized) { + for (i = 0; i < priv->array_rgb->len; i++) { + rgb_tmp = g_ptr_array_index (priv->array_rgb, i); /* is this 100% white? */ is_white = cd_it8_color_match (rgb_tmp, 1.0f, 1.0f, 1.0f); if (!is_white) continue; luminance_samples++; - xyz_tmp = g_ptr_array_index (it8->priv->array_xyz, i); + xyz_tmp = g_ptr_array_index (priv->array_xyz, i); lumi_xyz.X += xyz_tmp->X; lumi_xyz.Y += xyz_tmp->Y; lumi_xyz.Z += xyz_tmp->Z; @@ -1076,34 +1090,34 @@ lumi_str = cd_it8_convert_xyz_to_string (&lumi_xyz); /* write data */ - if (it8->priv->kind == CD_IT8_KIND_TI1) { + if (priv->kind == CD_IT8_KIND_TI1) { cmsIT8SetSheetType (it8_lcms, "CTI1 "); cmsIT8SetPropertyStr (it8_lcms, "DESCRIPTOR", "Calibration Target chart information 1"); - } else if (it8->priv->kind == CD_IT8_KIND_TI3) { + } else if (priv->kind == CD_IT8_KIND_TI3) { cmsIT8SetSheetType (it8_lcms, "CTI3 "); cmsIT8SetPropertyStr (it8_lcms, "DESCRIPTOR", "Calibration Target chart information 3"); } - if (it8->priv->kind == CD_IT8_KIND_TI3) { + if (priv->kind == CD_IT8_KIND_TI3) { cmsIT8SetPropertyStr (it8_lcms, "DEVICE_CLASS", "DISPLAY"); } cmsIT8SetPropertyStr (it8_lcms, "COLOR_REP", "RGB_XYZ"); - if (it8->priv->instrument != NULL) { + if (priv->instrument != NULL) { cmsIT8SetPropertyStr (it8_lcms, "TARGET_INSTRUMENT", - it8->priv->instrument); + priv->instrument); } cmsIT8SetPropertyStr (it8_lcms, "INSTRUMENT_TYPE_SPECTRAL", - it8->priv->spectral ? "YES" : "NO"); - if (it8->priv->normalized) { + priv->spectral ? "YES" : "NO"); + if (priv->normalized) { cmsIT8SetPropertyStr (it8_lcms, "NORMALIZED_TO_Y_100", "YES"); cmsIT8SetPropertyStr (it8_lcms, "LUMINANCE_XYZ_CDM2", lumi_str); } else { cmsIT8SetPropertyStr (it8_lcms, "NORMALIZED_TO_Y_100", "NO"); } _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_FIELDS", 7); - _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_SETS", it8->priv->array_rgb->len); + _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_SETS", priv->array_rgb->len); cmsIT8SetDataFormat (it8_lcms, 0, "SAMPLE_ID"); cmsIT8SetDataFormat (it8_lcms, 1, "RGB_R"); cmsIT8SetDataFormat (it8_lcms, 2, "RGB_G"); @@ -1113,12 +1127,12 @@ cmsIT8SetDataFormat (it8_lcms, 6, "XYZ_Z"); /* write to the it8 file */ - for (i = 0; i < it8->priv->array_rgb->len; i++) { - rgb_tmp = g_ptr_array_index (it8->priv->array_rgb, i); - xyz_tmp = g_ptr_array_index (it8->priv->array_xyz, i); + for (i = 0; i < priv->array_rgb->len; i++) { + rgb_tmp = g_ptr_array_index (priv->array_rgb, i); + xyz_tmp = g_ptr_array_index (priv->array_xyz, i); _cmsIT8SetDataRowColDbl(it8_lcms, i, 0, i + 1); - if (it8->priv->normalized) { + if (priv->normalized) { _cmsIT8SetDataRowColDbl(it8_lcms, i, 1, rgb_tmp->R * 100.0f); _cmsIT8SetDataRowColDbl(it8_lcms, i, 2, rgb_tmp->G * 100.0f); _cmsIT8SetDataRowColDbl(it8_lcms, i, 3, rgb_tmp->B * 100.0f); @@ -1143,6 +1157,7 @@ static gboolean cd_it8_save_to_file_cal (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); CdColorRGB *rgb_tmp; gboolean ret = TRUE; guint i; @@ -1153,21 +1168,21 @@ "Device Calibration Curves"); cmsIT8SetPropertyStr (it8_lcms, "DEVICE_CLASS", "DISPLAY"); cmsIT8SetPropertyStr (it8_lcms, "COLOR_REP", "RGB"); - if (it8->priv->instrument != NULL) { + if (priv->instrument != NULL) { cmsIT8SetPropertyStr (it8_lcms, "TARGET_INSTRUMENT", - it8->priv->instrument); + priv->instrument); } _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_FIELDS", 4); - _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_SETS", it8->priv->array_rgb->len); + _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_SETS", priv->array_rgb->len); cmsIT8SetDataFormat (it8_lcms, 0, "RGB_I"); cmsIT8SetDataFormat (it8_lcms, 1, "RGB_R"); cmsIT8SetDataFormat (it8_lcms, 2, "RGB_G"); cmsIT8SetDataFormat (it8_lcms, 3, "RGB_B"); /* write to the it8 file */ - for (i = 0; i < it8->priv->array_rgb->len; i++) { - rgb_tmp = g_ptr_array_index (it8->priv->array_rgb, i); - _cmsIT8SetDataRowColDbl(it8_lcms, i, 0, 1.0f / (gdouble) (it8->priv->array_rgb->len - 1) * (gdouble) i); + for (i = 0; i < priv->array_rgb->len; i++) { + rgb_tmp = g_ptr_array_index (priv->array_rgb, i); + _cmsIT8SetDataRowColDbl(it8_lcms, i, 0, 1.0f / (gdouble) (priv->array_rgb->len - 1) * (gdouble) i); _cmsIT8SetDataRowColDbl(it8_lcms, i, 1, rgb_tmp->R); _cmsIT8SetDataRowColDbl(it8_lcms, i, 2, rgb_tmp->G); _cmsIT8SetDataRowColDbl(it8_lcms, i, 3, rgb_tmp->B); @@ -1182,6 +1197,7 @@ static gboolean cd_it8_save_to_file_ccmx (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); gboolean ret = TRUE; cmsIT8SetSheetType (it8_lcms, "CCMX "); @@ -1196,21 +1212,21 @@ cmsIT8SetDataFormat (it8_lcms, 2, "XYZ_Z"); /* save instrument */ - if (it8->priv->instrument != NULL) { + if (priv->instrument != NULL) { cmsIT8SetPropertyStr (it8_lcms, "INSTRUMENT", - it8->priv->instrument); + priv->instrument); } /* just save the matrix */ - _cmsIT8SetDataRowColDbl (it8_lcms, 0, 0, it8->priv->matrix.m00); - _cmsIT8SetDataRowColDbl (it8_lcms, 0, 1, it8->priv->matrix.m01); - _cmsIT8SetDataRowColDbl (it8_lcms, 0, 2, it8->priv->matrix.m02); - _cmsIT8SetDataRowColDbl (it8_lcms, 1, 0, it8->priv->matrix.m10); - _cmsIT8SetDataRowColDbl (it8_lcms, 1, 1, it8->priv->matrix.m11); - _cmsIT8SetDataRowColDbl (it8_lcms, 1, 2, it8->priv->matrix.m12); - _cmsIT8SetDataRowColDbl (it8_lcms, 2, 0, it8->priv->matrix.m20); - _cmsIT8SetDataRowColDbl (it8_lcms, 2, 1, it8->priv->matrix.m21); - _cmsIT8SetDataRowColDbl (it8_lcms, 2, 2, it8->priv->matrix.m22); + _cmsIT8SetDataRowColDbl (it8_lcms, 0, 0, priv->matrix.m00); + _cmsIT8SetDataRowColDbl (it8_lcms, 0, 1, priv->matrix.m01); + _cmsIT8SetDataRowColDbl (it8_lcms, 0, 2, priv->matrix.m02); + _cmsIT8SetDataRowColDbl (it8_lcms, 1, 0, priv->matrix.m10); + _cmsIT8SetDataRowColDbl (it8_lcms, 1, 1, priv->matrix.m11); + _cmsIT8SetDataRowColDbl (it8_lcms, 1, 2, priv->matrix.m12); + _cmsIT8SetDataRowColDbl (it8_lcms, 2, 0, priv->matrix.m20); + _cmsIT8SetDataRowColDbl (it8_lcms, 2, 1, priv->matrix.m21); + _cmsIT8SetDataRowColDbl (it8_lcms, 2, 2, priv->matrix.m22); return ret; } @@ -1221,6 +1237,7 @@ static gboolean cd_it8_save_to_file_cmf (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); CdSpectrum *spectrum; guint i; guint j; @@ -1232,7 +1249,7 @@ "Color Match Function"); /* check data is valid */ - number_of_sets = it8->priv->array_spectra->len; + number_of_sets = priv->array_spectra->len; if (number_of_sets != 3) { g_set_error_literal (error, CD_IT8_ERROR, @@ -1242,7 +1259,7 @@ } /* all the arrays have to have the same length */ - spectrum = g_ptr_array_index (it8->priv->array_spectra, 0); + spectrum = g_ptr_array_index (priv->array_spectra, 0); spectral_bands = cd_spectrum_get_size (spectrum); _cmsIT8SetPropertyDbl (it8_lcms, "SPECTRAL_START_NM", cd_spectrum_get_start (spectrum)); _cmsIT8SetPropertyDbl (it8_lcms, "SPECTRAL_END_NM", cd_spectrum_get_end (spectrum)); @@ -1251,9 +1268,9 @@ _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_FIELDS", spectral_bands); /* set DATA_FORMAT (using an ID if there are more than one spectra */ - spectrum = g_ptr_array_index (it8->priv->array_spectra, 0); + spectrum = g_ptr_array_index (priv->array_spectra, 0); for (i = 0; i < spectral_bands; i++) { - _cleanup_free_ gchar *label = NULL; + g_autofree gchar *label = NULL; label = g_strdup_printf ("SPEC_%.0f", cd_spectrum_get_wavelength (spectrum, i)); cmsIT8SetDataFormat (it8_lcms, i, label); @@ -1262,9 +1279,9 @@ /* set DATA */ _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_SETS", number_of_sets); for (j = 0; j < number_of_sets; j++) { - spectrum = g_ptr_array_index (it8->priv->array_spectra, j); + spectrum = g_ptr_array_index (priv->array_spectra, j); for (i = 0; i < spectral_bands; i++) { - if (it8->priv->normalized) { + if (!priv->normalized) { _cmsIT8SetDataRowColDbl (it8_lcms, j, i, cd_spectrum_get_value (spectrum, i)); } else { @@ -1282,6 +1299,7 @@ static gboolean cd_it8_save_to_file_ccss_sp (CdIt8 *it8, cmsHANDLE it8_lcms, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); CdSpectrum *spectrum; gboolean has_index = FALSE; guint i; @@ -1289,7 +1307,7 @@ guint number_of_sets; guint spectral_bands; - switch (it8->priv->kind) { + switch (priv->kind) { case CD_IT8_KIND_CCSS: cmsIT8SetSheetType (it8_lcms, "CCSS "); cmsIT8SetPropertyStr (it8_lcms, "DESCRIPTOR", @@ -1310,7 +1328,7 @@ } /* check data is valid */ - number_of_sets = it8->priv->array_spectra->len; + number_of_sets = priv->array_spectra->len; if (number_of_sets == 0) { g_set_error_literal (error, CD_IT8_ERROR, @@ -1322,21 +1340,21 @@ has_index = TRUE; /* all the arrays have to have the same length */ - spectrum = g_ptr_array_index (it8->priv->array_spectra, 0); + spectrum = g_ptr_array_index (priv->array_spectra, 0); spectral_bands = cd_spectrum_get_size (spectrum); _cmsIT8SetPropertyDbl (it8_lcms, "SPECTRAL_START_NM", cd_spectrum_get_start (spectrum)); _cmsIT8SetPropertyDbl (it8_lcms, "SPECTRAL_END_NM", cd_spectrum_get_end (spectrum)); _cmsIT8SetPropertyInt (it8_lcms, "SPECTRAL_BANDS", spectral_bands); _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_FIELDS", spectral_bands + has_index); - if (it8->priv->normalized) + if (priv->normalized) _cmsIT8SetPropertyDbl (it8_lcms, "SPECTRAL_NORM", cd_spectrum_get_norm (spectrum)); /* set DATA_FORMAT (using an ID if there are more than one spectra */ if (has_index) cmsIT8SetDataFormat (it8_lcms, 0, "SAMPLE_ID"); - spectrum = g_ptr_array_index (it8->priv->array_spectra, 0); + spectrum = g_ptr_array_index (priv->array_spectra, 0); for (i = 0; i < spectral_bands; i++) { - _cleanup_free_ gchar *label = NULL; + g_autofree gchar *label = NULL; /* there are more spectral bands than integers between the * start and stop wavelengths */ if ((cd_spectrum_get_end (spectrum) - @@ -1353,13 +1371,13 @@ /* set DATA */ _cmsIT8SetPropertyInt (it8_lcms, "NUMBER_OF_SETS", number_of_sets); for (j = 0; j < number_of_sets; j++) { - spectrum = g_ptr_array_index (it8->priv->array_spectra, j); + spectrum = g_ptr_array_index (priv->array_spectra, j); if (has_index) { cmsIT8SetDataRowCol (it8_lcms, j, 0, cd_spectrum_get_id (spectrum)); } for (i = 0; i < spectral_bands; i++) { - if (it8->priv->normalized) { + if (!priv->normalized) { _cmsIT8SetDataRowColDbl (it8_lcms, j, i + has_index, cd_spectrum_get_value (spectrum, i)); } else { @@ -1390,42 +1408,43 @@ gsize *size, GError **error) { + CdIt8Private *priv = GET_PRIVATE (it8); cmsHANDLE it8_lcms = NULL; const gchar *tmp; gboolean ret; GDateTime *datetime = NULL; cmsUInt32Number size_tmp = 0; guint i; - _cleanup_free_ gchar *data_tmp = NULL; - _cleanup_free_ gchar *date_str = NULL; + g_autofree gchar *data_tmp = NULL; + g_autofree gchar *date_str = NULL; g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); /* set common data */ - it8_lcms = cmsIT8Alloc (it8->priv->context_lcms); - if (it8->priv->title != NULL) { + it8_lcms = cmsIT8Alloc (priv->context_lcms); + if (priv->title != NULL) { cmsIT8SetPropertyStr (it8_lcms, "DISPLAY", - it8->priv->title); + priv->title); } - if (it8->priv->originator != NULL) { + if (priv->originator != NULL) { cmsIT8SetPropertyStr (it8_lcms, "ORIGINATOR", - it8->priv->originator); + priv->originator); } - if (it8->priv->reference != NULL) { + if (priv->reference != NULL) { cmsIT8SetPropertyStr (it8_lcms, "REFERENCE", - it8->priv->reference); + priv->reference); } /* set time and date in crazy ArgllCMS format, e.g. * 'Wed Dec 19 18:47:57 2012' */ - if (it8->priv->enable_created) { + if (priv->enable_created) { datetime = g_date_time_new_now_local (); date_str = g_date_time_format (datetime, "%a %b %d %H:%M:%S %Y"); cmsIT8SetPropertyStr (it8_lcms, "CREATED", date_str); } /* set ti1 and ti3 specific data */ - switch (it8->priv->kind) { + switch (priv->kind) { case CD_IT8_KIND_TI1: case CD_IT8_KIND_TI3: ret = cd_it8_save_to_file_ti1_ti3 (it8, it8_lcms, error); @@ -1458,8 +1477,8 @@ } /* save any options */ - for (i = 0; i < it8->priv->options->len; i++) { - tmp = g_ptr_array_index (it8->priv->options, i); + for (i = 0; i < priv->options->len; i++) { + tmp = g_ptr_array_index (priv->options, i); cmsIT8SetPropertyStr (it8_lcms, tmp, "YES"); } @@ -1501,7 +1520,7 @@ cd_it8_save_to_file (CdIt8 *it8, GFile *file, GError **error) { gsize size = 0; - _cleanup_free_ gchar *data = NULL; + g_autofree gchar *data = NULL; g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -1528,8 +1547,9 @@ void cd_it8_add_option (CdIt8 *it8, const gchar *option) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - g_ptr_array_add (it8->priv->options, g_strdup (option)); + g_ptr_array_add (priv->options, g_strdup (option)); } /** @@ -1544,8 +1564,9 @@ void cd_it8_set_normalized (CdIt8 *it8, gboolean normalized) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - it8->priv->normalized = normalized; + priv->normalized = normalized; } /** @@ -1560,8 +1581,9 @@ void cd_it8_set_spectral (CdIt8 *it8, gboolean spectral) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - it8->priv->spectral = spectral; + priv->spectral = spectral; } /** @@ -1576,10 +1598,11 @@ void cd_it8_set_originator (CdIt8 *it8, const gchar *originator) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - g_free (it8->priv->originator); - it8->priv->originator = g_strdup (originator); + g_free (priv->originator); + priv->originator = g_strdup (originator); } /** @@ -1594,10 +1617,11 @@ void cd_it8_set_title (CdIt8 *it8, const gchar *title) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - g_free (it8->priv->title); - it8->priv->title = g_strdup (title); + g_free (priv->title); + priv->title = g_strdup (title); } /** @@ -1612,10 +1636,11 @@ void cd_it8_set_instrument (CdIt8 *it8, const gchar *instrument) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - g_free (it8->priv->instrument); - it8->priv->instrument = g_strdup (instrument); + g_free (priv->instrument); + priv->instrument = g_strdup (instrument); } /** @@ -1630,10 +1655,11 @@ void cd_it8_set_reference (CdIt8 *it8, const gchar *reference) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - g_free (it8->priv->reference); - it8->priv->reference = g_strdup (reference); + g_free (priv->reference); + priv->reference = g_strdup (reference); } /** @@ -1650,8 +1676,9 @@ void cd_it8_set_enable_created (CdIt8 *it8, gboolean enable_created) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - it8->priv->enable_created = enable_created; + priv->enable_created = enable_created; } /** @@ -1668,6 +1695,7 @@ void cd_it8_add_data (CdIt8 *it8, const CdColorRGB *rgb, const CdColorXYZ *xyz) { + CdIt8Private *priv = GET_PRIVATE (it8); CdColorRGB *rgb_tmp; CdColorXYZ *xyz_tmp; @@ -1680,7 +1708,7 @@ rgb_tmp = cd_color_rgb_new (); cd_color_rgb_set (rgb_tmp, 0.0f, 0.0f, 0.0f); } - g_ptr_array_add (it8->priv->array_rgb, rgb_tmp); + g_ptr_array_add (priv->array_rgb, rgb_tmp); /* add XYZ */ if (xyz != NULL) { @@ -1689,7 +1717,7 @@ xyz_tmp = cd_color_xyz_new (); cd_color_xyz_set (xyz_tmp, 0.0f, 0.0f, 0.0f); } - g_ptr_array_add (it8->priv->array_xyz, xyz_tmp); + g_ptr_array_add (priv->array_xyz, xyz_tmp); } /** @@ -1705,8 +1733,9 @@ guint cd_it8_get_data_size (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), G_MAXUINT); - return it8->priv->array_xyz->len; + return priv->array_xyz->len; } /** @@ -1726,19 +1755,20 @@ gboolean cd_it8_get_data_item (CdIt8 *it8, guint idx, CdColorRGB *rgb, CdColorXYZ *xyz) { + CdIt8Private *priv = GET_PRIVATE (it8); const CdColorRGB *rgb_tmp; const CdColorXYZ *xyz_tmp; g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); - if (idx > it8->priv->array_xyz->len) + if (idx > priv->array_xyz->len) return FALSE; if (rgb != NULL) { - rgb_tmp = g_ptr_array_index (it8->priv->array_rgb, idx); + rgb_tmp = g_ptr_array_index (priv->array_rgb, idx); cd_color_rgb_copy (rgb_tmp, rgb); } if (xyz != NULL) { - xyz_tmp = g_ptr_array_index (it8->priv->array_xyz, idx); + xyz_tmp = g_ptr_array_index (priv->array_xyz, idx); cd_color_xyz_copy (xyz_tmp, xyz); } return TRUE; @@ -1761,21 +1791,22 @@ CdColorXYZ * cd_it8_get_xyz_for_rgb (CdIt8 *it8, gdouble R, gdouble G, gdouble B, gdouble delta) { + CdIt8Private *priv = GET_PRIVATE (it8); CdColorXYZ *xyz_tmp; guint i; const CdColorRGB *rgb_tmp; - g_return_val_if_fail (CD_IS_IT8 (it8), FALSE); + g_return_val_if_fail (CD_IS_IT8 (it8), NULL); - for (i = 0; i < it8->priv->array_xyz->len; i++) { - rgb_tmp = g_ptr_array_index (it8->priv->array_rgb, i); + for (i = 0; i < priv->array_xyz->len; i++) { + rgb_tmp = g_ptr_array_index (priv->array_rgb, i); if (ABS (rgb_tmp->R - R) > delta) continue; if (ABS (rgb_tmp->G - G) > delta) continue; if (ABS (rgb_tmp->B - B) > delta) continue; - xyz_tmp = g_ptr_array_index (it8->priv->array_xyz, i); + xyz_tmp = g_ptr_array_index (priv->array_xyz, i); return xyz_tmp; } return NULL; @@ -1793,9 +1824,10 @@ void cd_it8_set_spectrum_array (CdIt8 *it8, GPtrArray *data) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (it8)); - g_ptr_array_unref (it8->priv->array_spectra); - it8->priv->array_spectra = g_ptr_array_ref (data); + g_ptr_array_unref (priv->array_spectra); + priv->array_spectra = g_ptr_array_ref (data); } /** @@ -1810,6 +1842,7 @@ void cd_it8_add_spectrum (CdIt8 *it8, CdSpectrum *spectrum) { + CdIt8Private *priv = GET_PRIVATE (it8); const gchar *id; CdSpectrum *tmp; @@ -1820,11 +1853,11 @@ if (id != NULL) { tmp = cd_it8_get_spectrum_by_id (it8, id); if (tmp != NULL) - g_ptr_array_remove (it8->priv->array_spectra, tmp); + g_ptr_array_remove (priv->array_spectra, tmp); } /* add this */ - g_ptr_array_add (it8->priv->array_spectra, cd_spectrum_dup (spectrum)); + g_ptr_array_add (priv->array_spectra, cd_spectrum_dup (spectrum)); } /** @@ -1840,8 +1873,9 @@ GPtrArray * cd_it8_get_spectrum_array (CdIt8 *it8) { + CdIt8Private *priv = GET_PRIVATE (it8); g_return_val_if_fail (CD_IS_IT8 (it8), NULL); - return g_ptr_array_ref (it8->priv->array_spectra); + return g_ptr_array_ref (priv->array_spectra); } /** @@ -1858,14 +1892,15 @@ CdSpectrum * cd_it8_get_spectrum_by_id (CdIt8 *it8, const gchar *id) { + CdIt8Private *priv = GET_PRIVATE (it8); CdSpectrum *tmp; guint i; g_return_val_if_fail (CD_IS_IT8 (it8), NULL); g_return_val_if_fail (id != NULL, NULL); - for (i = 0; i < it8->priv->array_spectra->len; i++) { - tmp = g_ptr_array_index (it8->priv->array_spectra, i); + for (i = 0; i < priv->array_spectra->len; i++) { + tmp = g_ptr_array_index (priv->array_spectra, i); if (g_strcmp0 (cd_spectrum_get_id (tmp), id) == 0) return tmp; } @@ -1884,28 +1919,29 @@ GParamSpec *pspec) { CdIt8 *it8 = CD_IT8 (object); + CdIt8Private *priv = GET_PRIVATE (it8); switch (prop_id) { case PROP_KIND: - g_value_set_uint (value, it8->priv->kind); + g_value_set_uint (value, priv->kind); break; case PROP_NORMALIZED: - g_value_set_boolean (value, it8->priv->normalized); + g_value_set_boolean (value, priv->normalized); break; case PROP_ORIGINATOR: - g_value_set_string (value, it8->priv->originator); + g_value_set_string (value, priv->originator); break; case PROP_TITLE: - g_value_set_string (value, it8->priv->title); + g_value_set_string (value, priv->title); break; case PROP_INSTRUMENT: - g_value_set_string (value, it8->priv->instrument); + g_value_set_string (value, priv->instrument); break; case PROP_REFERENCE: - g_value_set_string (value, it8->priv->reference); + g_value_set_string (value, priv->reference); break; case PROP_SPECTRAL: - g_value_set_boolean (value, it8->priv->spectral); + g_value_set_boolean (value, priv->spectral); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1920,10 +1956,11 @@ cd_it8_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { CdIt8 *it8 = CD_IT8 (object); + CdIt8Private *priv = GET_PRIVATE (it8); switch (prop_id) { case PROP_KIND: - it8->priv->kind = g_value_get_uint (value); + priv->kind = g_value_get_uint (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -2040,8 +2077,6 @@ NULL, NULL, FALSE, G_PARAM_READABLE)); - - g_type_class_add_private (klass, sizeof (CdIt8Private)); } /* @@ -2050,15 +2085,15 @@ static void cd_it8_init (CdIt8 *it8) { - it8->priv = CD_IT8_GET_PRIVATE (it8); - it8->priv->context_lcms = cd_context_lcms_new (); + CdIt8Private *priv = GET_PRIVATE (it8); + priv->context_lcms = cd_context_lcms_new (); - cd_mat33_clear (&it8->priv->matrix); - it8->priv->array_rgb = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_color_rgb_free); - it8->priv->array_xyz = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_color_xyz_free); - it8->priv->array_spectra = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_spectrum_free); - it8->priv->options = g_ptr_array_new_with_free_func (g_free); - it8->priv->enable_created = TRUE; + cd_mat33_clear (&priv->matrix); + priv->array_rgb = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_color_rgb_free); + priv->array_xyz = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_color_xyz_free); + priv->array_spectra = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_spectrum_free); + priv->options = g_ptr_array_new_with_free_func (g_free); + priv->enable_created = TRUE; /* ensure the remote errors are registered */ cd_it8_error_quark (); @@ -2071,18 +2106,19 @@ cd_it8_finalize (GObject *object) { CdIt8 *it8 = CD_IT8 (object); + CdIt8Private *priv = GET_PRIVATE (it8); g_return_if_fail (CD_IS_IT8 (object)); - cd_context_lcms_free (it8->priv->context_lcms); - g_ptr_array_unref (it8->priv->array_spectra); - g_ptr_array_unref (it8->priv->array_rgb); - g_ptr_array_unref (it8->priv->array_xyz); - g_ptr_array_unref (it8->priv->options); - g_free (it8->priv->originator); - g_free (it8->priv->title); - g_free (it8->priv->instrument); - g_free (it8->priv->reference); + cd_context_lcms_free (priv->context_lcms); + g_ptr_array_unref (priv->array_spectra); + g_ptr_array_unref (priv->array_rgb); + g_ptr_array_unref (priv->array_xyz); + g_ptr_array_unref (priv->options); + g_free (priv->originator); + g_free (priv->title); + g_free (priv->instrument); + g_free (priv->reference); G_OBJECT_CLASS (cd_it8_parent_class)->finalize (object); } diff -Nru colord-1.2.12/lib/colord/cd-it8.h colord-1.3.2/lib/colord/cd-it8.h --- colord-1.2.12/lib/colord/cd-it8.h 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-it8.h 2015-10-13 15:24:13.000000000 +0000 @@ -35,24 +35,13 @@ G_BEGIN_DECLS -#define CD_TYPE_IT8 (cd_it8_get_type ()) -#define CD_IT8(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_IT8, CdIt8)) -#define CD_IT8_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_IT8, CdIt8Class)) -#define CD_IS_IT8(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_IT8)) -#define CD_IS_IT8_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_IT8)) -#define CD_IT8_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_IT8, CdIt8Class)) #define CD_IT8_ERROR (cd_it8_error_quark ()) #define CD_IT8_TYPE_ERROR (cd_it8_error_get_type ()) -typedef struct _CdIt8Private CdIt8Private; +#define CD_TYPE_IT8 (cd_it8_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdIt8, cd_it8, CD, IT8, GObject) -typedef struct -{ - GObject parent; - CdIt8Private *priv; -} CdIt8; - -typedef struct +struct _CdIt8Class { GObjectClass parent_class; /*< private >*/ @@ -65,7 +54,7 @@ void (*_cd_it8_reserved6) (void); void (*_cd_it8_reserved7) (void); void (*_cd_it8_reserved8) (void); -} CdIt8Class; +}; /** * CdIt8Error: @@ -100,7 +89,6 @@ CD_IT8_KIND_LAST } CdIt8Kind; -GType cd_it8_get_type (void); GQuark cd_it8_error_quark (void); CdIt8 *cd_it8_new (void); CdIt8 *cd_it8_new_with_kind (CdIt8Kind kind); diff -Nru colord-1.2.12/lib/colord/cd-it8-utils.c colord-1.3.2/lib/colord/cd-it8-utils.c --- colord-1.2.12/lib/colord/cd-it8-utils.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-it8-utils.c 2015-10-13 15:52:28.000000000 +0000 @@ -32,7 +32,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-color.h" #include "cd-it8-utils.h" #include "cd-math.h" @@ -194,7 +193,7 @@ gdouble m_lumi = 0.0f; gdouble n_lumi = 0.0f; guint i; - _cleanup_free_ gchar *tmp = NULL; + g_autofree gchar *tmp = NULL; /* read reference matrix */ if (!ch_it8_utils_4color_decompose (it8_reference, &n_rgb, &n_lumi, error)) @@ -345,7 +344,6 @@ CdColorXYZ reference_illuminant_xyz; CdColorXYZ sample_xyz; CdColorYxy yxy; - CdSpectrum *reference_illuminant = NULL; CdSpectrum *sample; CdSpectrum *unity; GPtrArray *samples; @@ -354,6 +352,7 @@ gdouble ri_sum = 0.f; gdouble val; guint i; + g_autoptr(CdSpectrum) reference_illuminant = NULL; /* get the illuminant CCT */ unity = cd_spectrum_new (); @@ -364,7 +363,7 @@ resolution, error); if (!ret) - goto out; + return FALSE; cct = cd_color_xyz_to_cct (&illuminant_xyz); cd_color_xyz_normalize (&illuminant_xyz, 1.0, &illuminant_xyz); @@ -372,12 +371,11 @@ if (cct < 5000) { reference_illuminant = cd_spectrum_planckian_new (cct); } else { - ret = FALSE; g_set_error_literal (error, CD_IT8_ERROR, CD_IT8_ERROR_FAILED, "need to use CIE standard illuminant D"); - goto out; + return FALSE; } cd_spectrum_normalize (reference_illuminant, 560, 1.0); ret = cd_it8_utils_calculate_xyz_from_cmf (cmf, @@ -387,7 +385,7 @@ resolution, error); if (!ret) - goto out; + return FALSE; /* check the source is white enough */ cd_color_uvw_set_planckian_locus (&d1, cct); @@ -395,12 +393,11 @@ cd_color_yxy_to_uvw (&yxy, &d2); val = cd_color_uvw_get_chroma_difference (&d1, &d2); if (val > 5.4e-3) { - ret = FALSE; g_set_error (error, CD_IT8_ERROR, CD_IT8_ERROR_FAILED, "result not meaningful, DC=%f", val); - goto out; + return FALSE; } /* get the XYZ for each color sample under the reference illuminant */ @@ -414,7 +411,7 @@ 1.f, error); if (!ret) - goto out; + return FALSE; cd_color_xyz_to_uvw (&sample_xyz, &illuminant_xyz, &reference_uvw[i]); @@ -431,7 +428,7 @@ resolution, error); if (!ret) - goto out; + return FALSE; cd_color_xyz_to_uvw (&sample_xyz, &illuminant_xyz, &unknown_uvw[i]); @@ -444,10 +441,7 @@ ri_sum += 100 - (4.6 * val); } *value = ri_sum / 8; -out: - if (reference_illuminant != NULL) - cd_spectrum_free (reference_illuminant); - return ret; + return TRUE; } /** @@ -493,7 +487,8 @@ gdouble max = 0.f; guint cnt = 0; guint i; - _cleanup_free_ cmsFloat32Number *data_y = NULL; + gdouble gamma_tmp = 0.f; + g_autofree cmsFloat32Number *data_y = NULL; /* find the grey gamma ramp */ len = cd_it8_get_data_size (it8); @@ -534,8 +529,21 @@ /* use lcms2 to calculate the gamma */ curve = cmsBuildTabulatedToneCurveFloat (NULL, cnt, data_y); + gamma_tmp = cmsEstimateGamma (curve, 0.1); + if (gamma_tmp < 0) { + g_autoptr(GString) str = NULL; + str = g_string_new ("Unable to calculate gamma from: "); + for (i = 0; i < cnt; i++) + g_string_append_printf (str, "%f, ", data_y[i]); + g_string_truncate (str, str->len - 2); + g_set_error_literal (error, + CD_IT8_ERROR, + CD_IT8_ERROR_FAILED, + str->str); + return FALSE; + } if (gamma_y != NULL) - *gamma_y = cmsEstimateGamma (curve, 0.1); + *gamma_y = gamma_tmp; cmsFreeToneCurve (curve); return TRUE; } diff -Nru colord-1.2.12/lib/colord/cd-profile.c colord-1.3.2/lib/colord/cd-profile.c --- colord-1.2.12/lib/colord/cd-profile.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-profile.c 2016-03-15 12:26:34.000000000 +0000 @@ -37,14 +37,13 @@ #include #include -#include "cd-cleanup.h" #include "cd-profile.h" static void cd_profile_class_init (CdProfileClass *klass); static void cd_profile_init (CdProfile *profile); static void cd_profile_finalize (GObject *object); -#define CD_PROFILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_PROFILE, CdProfilePrivate)) +#define GET_PRIVATE(o) (cd_profile_get_instance_private (o)) #define COLORD_DBUS_SERVICE "org.freedesktop.ColorManager" #define COLORD_DBUS_INTERFACE_PROFILE "org.freedesktop.ColorManager.Profile" @@ -54,7 +53,7 @@ * * Private #CdProfile data **/ -struct _CdProfilePrivate +typedef struct { gchar *filename; gchar *id; @@ -72,7 +71,7 @@ guint owner; gchar **warnings; GHashTable *metadata; -}; +} CdProfilePrivate; enum { PROP_0, @@ -101,7 +100,7 @@ static guint signals [SIGNAL_LAST] = { 0 }; -G_DEFINE_TYPE (CdProfile, cd_profile, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdProfile, cd_profile, G_TYPE_OBJECT) /** * cd_profile_error_quark: @@ -131,9 +130,10 @@ void cd_profile_set_object_path (CdProfile *profile, const gchar *object_path) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (profile)); - g_return_if_fail (profile->priv->object_path == NULL); - profile->priv->object_path = g_strdup (object_path); + g_return_if_fail (priv->object_path == NULL); + priv->object_path = g_strdup (object_path); } /** @@ -149,9 +149,10 @@ const gchar * cd_profile_get_id (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - g_return_val_if_fail (profile->priv->proxy != NULL, NULL); - return profile->priv->id; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->id; } /** @@ -167,9 +168,10 @@ const gchar * cd_profile_get_filename (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - g_return_val_if_fail (profile->priv->proxy != NULL, NULL); - return profile->priv->filename; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->filename; } /** @@ -185,15 +187,17 @@ gboolean cd_profile_has_access (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); + g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - g_return_val_if_fail (profile->priv->proxy != NULL, FALSE); + g_return_val_if_fail (priv->proxy != NULL, FALSE); /* virtual profile */ - if (profile->priv->filename == NULL) + if (priv->filename == NULL) return TRUE; /* profile on disk */ - return g_access (profile->priv->filename, R_OK) == 0; + return g_access (priv->filename, R_OK) == 0; } /** @@ -209,9 +213,10 @@ const gchar * cd_profile_get_qualifier (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - g_return_val_if_fail (profile->priv->proxy != NULL, NULL); - return profile->priv->qualifier; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->qualifier; } /** @@ -227,9 +232,10 @@ const gchar * cd_profile_get_format (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - g_return_val_if_fail (profile->priv->proxy != NULL, NULL); - return profile->priv->format; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->format; } /** @@ -245,9 +251,10 @@ const gchar * cd_profile_get_title (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - g_return_val_if_fail (profile->priv->proxy != NULL, NULL); - return profile->priv->title; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->title; } /** @@ -263,9 +270,10 @@ CdProfileKind cd_profile_get_kind (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), CD_PROFILE_KIND_UNKNOWN); - g_return_val_if_fail (profile->priv->proxy != NULL, CD_PROFILE_KIND_UNKNOWN); - return profile->priv->kind; + g_return_val_if_fail (priv->proxy != NULL, CD_PROFILE_KIND_UNKNOWN); + return priv->kind; } /** @@ -281,9 +289,10 @@ CdObjectScope cd_profile_get_scope (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), CD_OBJECT_SCOPE_UNKNOWN); - g_return_val_if_fail (profile->priv->proxy != NULL, CD_OBJECT_SCOPE_UNKNOWN); - return profile->priv->scope; + g_return_val_if_fail (priv->proxy != NULL, CD_OBJECT_SCOPE_UNKNOWN); + return priv->scope; } /** @@ -299,9 +308,10 @@ guint cd_profile_get_owner (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), G_MAXUINT); - g_return_val_if_fail (profile->priv->proxy != NULL, G_MAXUINT); - return profile->priv->owner; + g_return_val_if_fail (priv->proxy != NULL, G_MAXUINT); + return priv->owner; } /** @@ -317,9 +327,10 @@ gchar ** cd_profile_get_warnings (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - g_return_val_if_fail (profile->priv->proxy != NULL, NULL); - return profile->priv->warnings; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->warnings; } /** @@ -335,9 +346,10 @@ gint64 cd_profile_get_created (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), 0); - g_return_val_if_fail (profile->priv->proxy != NULL, 0); - return profile->priv->created; + g_return_val_if_fail (priv->proxy != NULL, 0); + return priv->created; } /** @@ -353,12 +365,14 @@ gint64 cd_profile_get_age (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); + g_return_val_if_fail (CD_IS_PROFILE (profile), 0); - g_return_val_if_fail (profile->priv->proxy != NULL, 0); + g_return_val_if_fail (priv->proxy != NULL, 0); - if (profile->priv->created == 0) + if (priv->created == 0) return 0; - return (g_get_real_time () / G_USEC_PER_SEC) - profile->priv->created; + return (g_get_real_time () / G_USEC_PER_SEC) - priv->created; } /** @@ -374,9 +388,10 @@ CdColorspace cd_profile_get_colorspace (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), CD_COLORSPACE_UNKNOWN); - g_return_val_if_fail (profile->priv->proxy != NULL, CD_COLORSPACE_UNKNOWN); - return profile->priv->colorspace; + g_return_val_if_fail (priv->proxy != NULL, CD_COLORSPACE_UNKNOWN); + return priv->colorspace; } /** @@ -392,9 +407,10 @@ gboolean cd_profile_get_has_vcgt (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - g_return_val_if_fail (profile->priv->proxy != NULL, FALSE); - return profile->priv->has_vcgt; + g_return_val_if_fail (priv->proxy != NULL, FALSE); + return priv->has_vcgt; } /** @@ -411,9 +427,10 @@ gboolean cd_profile_get_is_system_wide (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - g_return_val_if_fail (profile->priv->proxy != NULL, FALSE); - return profile->priv->is_system_wide; + g_return_val_if_fail (priv->proxy != NULL, FALSE); + return priv->is_system_wide; } /** @@ -430,9 +447,10 @@ GHashTable * cd_profile_get_metadata (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - g_return_val_if_fail (profile->priv->proxy != NULL, NULL); - return g_hash_table_ref (profile->priv->metadata); + g_return_val_if_fail (priv->proxy != NULL, NULL); + return g_hash_table_ref (priv->metadata); } /** @@ -449,9 +467,10 @@ const gchar * cd_profile_get_metadata_item (CdProfile *profile, const gchar *key) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - g_return_val_if_fail (profile->priv->proxy != NULL, NULL); - return g_hash_table_lookup (profile->priv->metadata, key); + g_return_val_if_fail (priv->proxy != NULL, NULL); + return g_hash_table_lookup (priv->metadata, key); } /** @@ -460,18 +479,19 @@ static void cd_profile_set_metadata_from_variant (CdProfile *profile, GVariant *variant) { + CdProfilePrivate *priv = GET_PRIVATE (profile); GVariantIter iter; const gchar *prop_key; const gchar *prop_value; /* remove old entries */ - g_hash_table_remove_all (profile->priv->metadata); + g_hash_table_remove_all (priv->metadata); /* insert the new metadata */ g_variant_iter_init (&iter, variant); while (g_variant_iter_loop (&iter, "{ss}", &prop_key, &prop_value)) { - g_hash_table_insert (profile->priv->metadata, + g_hash_table_insert (priv->metadata, g_strdup (prop_key), g_strdup (prop_value)); @@ -504,6 +524,7 @@ const gchar * const *invalidated_properties, CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); guint i; guint len; GVariantIter iter; @@ -519,37 +540,37 @@ &property_name, &property_value); if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_QUALIFIER) == 0) { - g_free (profile->priv->qualifier); - profile->priv->qualifier = cd_profile_get_nullable_str (property_value); + g_free (priv->qualifier); + priv->qualifier = cd_profile_get_nullable_str (property_value); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_FORMAT) == 0) { - g_free (profile->priv->format); - profile->priv->format = cd_profile_get_nullable_str (property_value); + g_free (priv->format); + priv->format = cd_profile_get_nullable_str (property_value); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_FILENAME) == 0) { - g_free (profile->priv->filename); - profile->priv->filename = cd_profile_get_nullable_str (property_value); + g_free (priv->filename); + priv->filename = cd_profile_get_nullable_str (property_value); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_ID) == 0) { - g_free (profile->priv->id); - profile->priv->id = g_variant_dup_string (property_value, NULL); + g_free (priv->id); + priv->id = g_variant_dup_string (property_value, NULL); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_TITLE) == 0) { - g_free (profile->priv->title); - profile->priv->title = g_variant_dup_string (property_value, NULL); + g_free (priv->title); + priv->title = g_variant_dup_string (property_value, NULL); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_WARNINGS) == 0) { - g_strfreev(profile->priv->warnings); - profile->priv->warnings = g_variant_dup_strv (property_value, NULL); + g_strfreev(priv->warnings); + priv->warnings = g_variant_dup_strv (property_value, NULL); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_KIND) == 0) { - profile->priv->kind = cd_profile_kind_from_string (g_variant_get_string (property_value, NULL)); + priv->kind = cd_profile_kind_from_string (g_variant_get_string (property_value, NULL)); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_COLORSPACE) == 0) { - profile->priv->colorspace = cd_colorspace_from_string (g_variant_get_string (property_value, NULL)); + priv->colorspace = cd_colorspace_from_string (g_variant_get_string (property_value, NULL)); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_SCOPE) == 0) { - profile->priv->scope = cd_object_scope_from_string (g_variant_get_string (property_value, NULL)); + priv->scope = cd_object_scope_from_string (g_variant_get_string (property_value, NULL)); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_CREATED) == 0) { - profile->priv->created = g_variant_get_int64 (property_value); + priv->created = g_variant_get_int64 (property_value); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_HAS_VCGT) == 0) { - profile->priv->has_vcgt = g_variant_get_boolean (property_value); + priv->has_vcgt = g_variant_get_boolean (property_value); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_OWNER) == 0) { - profile->priv->owner = g_variant_get_uint32 (property_value); + priv->owner = g_variant_get_uint32 (property_value); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_IS_SYSTEM_WIDE) == 0) { - profile->priv->is_system_wide = g_variant_get_boolean (property_value); + priv->is_system_wide = g_variant_get_boolean (property_value); } else if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_METADATA) == 0) { cd_profile_set_metadata_from_variant (profile, property_value); } else { @@ -601,17 +622,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, profile), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } /** @@ -620,7 +632,7 @@ static void cd_profile_fixup_dbus_error (GError *error) { - _cleanup_free_ gchar *name = NULL; + g_autofree gchar *name = NULL; g_return_if_fail (error != NULL); @@ -641,147 +653,145 @@ gpointer user_data) { CdProfile *profile; - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *colorspace = NULL; - _cleanup_variant_unref_ GVariant *created = NULL; - _cleanup_variant_unref_ GVariant *filename = NULL; - _cleanup_variant_unref_ GVariant *format = NULL; - _cleanup_variant_unref_ GVariant *has_vcgt = NULL; - _cleanup_variant_unref_ GVariant *id = NULL; - _cleanup_variant_unref_ GVariant *is_system_wide = NULL; - _cleanup_variant_unref_ GVariant *kind = NULL; - _cleanup_variant_unref_ GVariant *metadata = NULL; - _cleanup_variant_unref_ GVariant *owner = NULL; - _cleanup_variant_unref_ GVariant *qualifier = NULL; - _cleanup_variant_unref_ GVariant *scope = NULL; - _cleanup_variant_unref_ GVariant *title = NULL; - _cleanup_variant_unref_ GVariant *warnings = NULL; - - profile = CD_PROFILE (g_async_result_get_source_object (G_ASYNC_RESULT (user_data))); - profile->priv->proxy = g_dbus_proxy_new_for_bus_finish (res, - &error); - if (profile->priv->proxy == NULL) { - g_simple_async_result_set_error (res_source, + CdProfilePrivate *priv; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) colorspace = NULL; + g_autoptr(GVariant) created = NULL; + g_autoptr(GVariant) filename = NULL; + g_autoptr(GVariant) format = NULL; + g_autoptr(GVariant) has_vcgt = NULL; + g_autoptr(GVariant) id = NULL; + g_autoptr(GVariant) is_system_wide = NULL; + g_autoptr(GVariant) kind = NULL; + g_autoptr(GVariant) metadata = NULL; + g_autoptr(GVariant) owner = NULL; + g_autoptr(GVariant) qualifier = NULL; + g_autoptr(GVariant) scope = NULL; + g_autoptr(GVariant) title = NULL; + g_autoptr(GVariant) warnings = NULL; + + profile = CD_PROFILE (g_task_get_source_object (task)); + priv = GET_PRIVATE (profile); + priv->proxy = g_dbus_proxy_new_for_bus_finish (res, &error); + if (priv->proxy == NULL) { + g_task_return_new_error (task, CD_PROFILE_ERROR, CD_PROFILE_ERROR_INTERNAL, "Failed to connect to profile %s: %s", cd_profile_get_object_path (profile), error->message); - g_simple_async_result_complete_in_idle (res_source); return; } /* get profile id */ - id = g_dbus_proxy_get_cached_property (profile->priv->proxy, + id = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_ID); if (id != NULL) - profile->priv->id = g_variant_dup_string (id, NULL); + priv->id = g_variant_dup_string (id, NULL); /* if the profile is missing, then fail */ if (id == NULL) { - g_simple_async_result_set_error (res_source, + g_task_return_new_error (task, CD_PROFILE_ERROR, CD_PROFILE_ERROR_INTERNAL, "Failed to connect to missing profile %s", cd_profile_get_object_path (profile)); - g_simple_async_result_complete_in_idle (res_source); return; } /* get filename */ - filename = g_dbus_proxy_get_cached_property (profile->priv->proxy, + filename = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_FILENAME); if (filename != NULL) - profile->priv->filename = cd_profile_get_nullable_str (filename); + priv->filename = cd_profile_get_nullable_str (filename); /* get qualifier */ - qualifier = g_dbus_proxy_get_cached_property (profile->priv->proxy, + qualifier = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_QUALIFIER); if (qualifier != NULL) - profile->priv->qualifier = cd_profile_get_nullable_str (qualifier); + priv->qualifier = cd_profile_get_nullable_str (qualifier); /* get format */ - format = g_dbus_proxy_get_cached_property (profile->priv->proxy, + format = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_FORMAT); if (format != NULL) - profile->priv->format = cd_profile_get_nullable_str (format); + priv->format = cd_profile_get_nullable_str (format); /* get title */ - title = g_dbus_proxy_get_cached_property (profile->priv->proxy, + title = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_TITLE); if (title != NULL) - profile->priv->title = cd_profile_get_nullable_str (title); + priv->title = cd_profile_get_nullable_str (title); /* get kind */ - kind = g_dbus_proxy_get_cached_property (profile->priv->proxy, + kind = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_KIND); if (kind != NULL) - profile->priv->kind = cd_profile_kind_from_string (g_variant_get_string (kind, NULL)); + priv->kind = cd_profile_kind_from_string (g_variant_get_string (kind, NULL)); /* get colorspace */ - colorspace = g_dbus_proxy_get_cached_property (profile->priv->proxy, + colorspace = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_COLORSPACE); if (colorspace != NULL) - profile->priv->colorspace = cd_colorspace_from_string (g_variant_get_string (colorspace, NULL)); + priv->colorspace = cd_colorspace_from_string (g_variant_get_string (colorspace, NULL)); /* get scope */ - scope = g_dbus_proxy_get_cached_property (profile->priv->proxy, + scope = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_SCOPE); if (scope != NULL) - profile->priv->scope = cd_object_scope_from_string (g_variant_get_string (scope, NULL)); + priv->scope = cd_object_scope_from_string (g_variant_get_string (scope, NULL)); /* get owner */ - owner = g_dbus_proxy_get_cached_property (profile->priv->proxy, + owner = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_OWNER); if (owner != NULL) - profile->priv->owner = g_variant_get_uint32 (owner); + priv->owner = g_variant_get_uint32 (owner); /* get warnings */ - warnings = g_dbus_proxy_get_cached_property (profile->priv->proxy, + warnings = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_WARNINGS); if (warnings != NULL) - profile->priv->warnings = g_variant_dup_strv (warnings, NULL); + priv->warnings = g_variant_dup_strv (warnings, NULL); /* get created */ - created = g_dbus_proxy_get_cached_property (profile->priv->proxy, + created = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_CREATED); if (created != NULL) - profile->priv->created = g_variant_get_int64 (created); + priv->created = g_variant_get_int64 (created); /* get VCGT */ - has_vcgt = g_dbus_proxy_get_cached_property (profile->priv->proxy, + has_vcgt = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_HAS_VCGT); if (has_vcgt != NULL) - profile->priv->has_vcgt = g_variant_get_boolean (has_vcgt); + priv->has_vcgt = g_variant_get_boolean (has_vcgt); /* get if system wide */ - is_system_wide = g_dbus_proxy_get_cached_property (profile->priv->proxy, + is_system_wide = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_IS_SYSTEM_WIDE); if (is_system_wide != NULL) - profile->priv->is_system_wide = g_variant_get_boolean (is_system_wide); + priv->is_system_wide = g_variant_get_boolean (is_system_wide); /* get if system wide */ - metadata = g_dbus_proxy_get_cached_property (profile->priv->proxy, + metadata = g_dbus_proxy_get_cached_property (priv->proxy, CD_PROFILE_PROPERTY_METADATA); if (metadata != NULL) cd_profile_set_metadata_from_variant (profile, metadata); /* get signals from DBus */ - g_signal_connect (profile->priv->proxy, - "g-signal", - G_CALLBACK (cd_profile_dbus_signal_cb), - profile); + g_signal_connect_object (priv->proxy, + "g-signal", + G_CALLBACK (cd_profile_dbus_signal_cb), + profile, 0); /* watch if any remote properties change */ - g_signal_connect (profile->priv->proxy, - "g-properties-changed", - G_CALLBACK (cd_profile_dbus_properties_changed_cb), - profile); + g_signal_connect_object (priv->proxy, + "g-properties-changed", + G_CALLBACK (cd_profile_dbus_properties_changed_cb), + profile, 0); /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -801,20 +811,17 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdProfilePrivate *priv = GET_PRIVATE (profile); + GTask *task = NULL; g_return_if_fail (CD_IS_PROFILE (profile)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - res = g_simple_async_result_new (G_OBJECT (profile), - callback, - user_data, - cd_profile_connect); + task = g_task_new (profile, cancellable, callback, user_data); /* already connected */ - if (profile->priv->proxy != NULL) { - g_simple_async_result_set_op_res_gboolean (res, TRUE); - g_simple_async_result_complete_in_idle (res); + if (priv->proxy != NULL) { + g_task_return_boolean (task, TRUE); return; } @@ -822,11 +829,11 @@ G_DBUS_PROXY_FLAGS_NONE, NULL, COLORD_DBUS_SERVICE, - profile->priv->object_path, + priv->object_path, COLORD_DBUS_INTERFACE_PROFILE, cancellable, cd_profile_connect_cb, - res); + task); } /**********************************************************************/ @@ -848,17 +855,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, profile), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -866,26 +864,24 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { - g_simple_async_result_set_error (res_source, + g_task_return_new_error (task, CD_PROFILE_ERROR, CD_PROFILE_ERROR_INTERNAL, "Failed to SetProperty: %s", error->message); - g_simple_async_result_complete_in_idle (res_source); return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -909,19 +905,17 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdProfilePrivate *priv = GET_PRIVATE (profile); + GTask *task = NULL; g_return_if_fail (CD_IS_PROFILE (profile)); g_return_if_fail (key != NULL); g_return_if_fail (value != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (profile->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (profile), - callback, - user_data, - cd_profile_set_property); - g_dbus_proxy_call (profile->priv->proxy, + task = g_task_new (profile, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "SetProperty", g_variant_new ("(ss)", key, @@ -930,7 +924,7 @@ -1, cancellable, cd_profile_set_property_cb, - res); + task); } /**********************************************************************/ @@ -952,17 +946,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, profile), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -970,23 +955,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_profile_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -1006,24 +990,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdProfilePrivate *priv = GET_PRIVATE (profile); + GTask *task = NULL; g_return_if_fail (CD_IS_PROFILE (profile)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (profile->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (profile), - callback, - user_data, - cd_profile_install_system_wide); - g_dbus_proxy_call (profile->priv->proxy, + task = g_task_new (profile, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "InstallSystemWide", NULL, G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_profile_install_system_wide_cb, - res); + task); } /**********************************************************************/ @@ -1041,8 +1023,9 @@ const gchar * cd_profile_get_object_path (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return profile->priv->object_path; + return priv->object_path; } /** @@ -1058,8 +1041,9 @@ gboolean cd_profile_get_connected (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - return profile->priv->proxy != NULL; + return priv->proxy != NULL; } /** @@ -1075,13 +1059,14 @@ gchar * cd_profile_to_string (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); GString *string; g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); string = g_string_new (""); g_string_append_printf (string, " object-path: %s\n", - profile->priv->object_path); + priv->object_path); return g_string_free (string, FALSE); } @@ -1100,12 +1085,13 @@ gboolean cd_profile_equal (CdProfile *profile1, CdProfile *profile2) { + CdProfilePrivate *priv1 = GET_PRIVATE (profile1); + CdProfilePrivate *priv2 = GET_PRIVATE (profile2); g_return_val_if_fail (CD_IS_PROFILE (profile1), FALSE); g_return_val_if_fail (CD_IS_PROFILE (profile2), FALSE); - if (profile1->priv->id == NULL || - profile2->priv->id == NULL) + if (priv1->id == NULL || priv2->id == NULL) g_critical ("need to connect"); - return g_strcmp0 (profile1->priv->id, profile2->priv->id) == 0; + return g_strcmp0 (priv1->id, priv2->id) == 0; } /** @@ -1127,24 +1113,25 @@ GCancellable *cancellable, GError **error) { - _cleanup_object_unref_ CdIcc *icc = NULL; - _cleanup_object_unref_ GFile *file = NULL; + CdProfilePrivate *priv = GET_PRIVATE (profile); + g_autoptr(CdIcc) icc = NULL; + g_autoptr(GFile) file = NULL; g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); /* not a local profile */ - if (profile->priv->filename == NULL) { + if (priv->filename == NULL) { g_set_error (error, CD_PROFILE_ERROR, CD_PROFILE_ERROR_INTERNAL, "%s has no local instance", - profile->priv->id); + priv->id); return NULL; } /* load local instance */ icc = cd_icc_new (); - file = g_file_new_for_path (profile->priv->filename); + file = g_file_new_for_path (priv->filename); if (!cd_icc_load_file (icc, file, flags, cancellable, error)) return NULL; @@ -1159,11 +1146,12 @@ _cd_profile_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { CdProfile *profile = CD_PROFILE (object); + CdProfilePrivate *priv = GET_PRIVATE (profile); switch (prop_id) { case PROP_OBJECT_PATH: - g_free (profile->priv->object_path); - profile->priv->object_path = g_value_dup_string (value); + g_free (priv->object_path); + priv->object_path = g_value_dup_string (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1178,52 +1166,53 @@ cd_profile_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { CdProfile *profile = CD_PROFILE (object); + CdProfilePrivate *priv = GET_PRIVATE (profile); switch (prop_id) { case PROP_OBJECT_PATH: - g_value_set_string (value, profile->priv->object_path); + g_value_set_string (value, priv->object_path); break; case PROP_CONNECTED: - g_value_set_boolean (value, profile->priv->proxy != NULL); + g_value_set_boolean (value, priv->proxy != NULL); break; case PROP_ID: - g_value_set_string (value, profile->priv->id); + g_value_set_string (value, priv->id); break; case PROP_FILENAME: - g_value_set_string (value, profile->priv->filename); + g_value_set_string (value, priv->filename); break; case PROP_QUALIFIER: - g_value_set_string (value, profile->priv->qualifier); + g_value_set_string (value, priv->qualifier); break; case PROP_FORMAT: - g_value_set_string (value, profile->priv->format); + g_value_set_string (value, priv->format); break; case PROP_TITLE: - g_value_set_string (value, profile->priv->title); + g_value_set_string (value, priv->title); break; case PROP_KIND: - g_value_set_uint (value, profile->priv->kind); + g_value_set_uint (value, priv->kind); break; case PROP_COLORSPACE: - g_value_set_uint (value, profile->priv->colorspace); + g_value_set_uint (value, priv->colorspace); break; case PROP_CREATED: - g_value_set_int64 (value, profile->priv->created); + g_value_set_int64 (value, priv->created); break; case PROP_HAS_VCGT: - g_value_set_boolean (value, profile->priv->has_vcgt); + g_value_set_boolean (value, priv->has_vcgt); break; case PROP_IS_SYSTEM_WIDE: - g_value_set_boolean (value, profile->priv->is_system_wide); + g_value_set_boolean (value, priv->is_system_wide); break; case PROP_SCOPE: - g_value_set_uint (value, profile->priv->scope); + g_value_set_uint (value, priv->scope); break; case PROP_OWNER: - g_value_set_uint (value, profile->priv->owner); + g_value_set_uint (value, priv->owner); break; case PROP_WARNINGS: - g_value_set_boxed (value, profile->priv->warnings); + g_value_set_boxed (value, priv->warnings); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1466,8 +1455,6 @@ NULL, NULL, G_TYPE_STRV, G_PARAM_READABLE)); - - g_type_class_add_private (klass, sizeof (CdProfilePrivate)); } /* @@ -1476,8 +1463,8 @@ static void cd_profile_init (CdProfile *profile) { - profile->priv = CD_PROFILE_GET_PRIVATE (profile); - profile->priv->metadata = g_hash_table_new_full (g_str_hash, + CdProfilePrivate *priv = GET_PRIVATE (profile); + priv->metadata = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); @@ -1489,28 +1476,27 @@ static void cd_profile_finalize (GObject *object) { - CdProfile *profile; + CdProfile *profile = CD_PROFILE (object); + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (object)); - profile = CD_PROFILE (object); - - g_hash_table_unref (profile->priv->metadata); - g_free (profile->priv->object_path); - g_free (profile->priv->id); - g_free (profile->priv->filename); - g_free (profile->priv->qualifier); - g_free (profile->priv->format); - g_free (profile->priv->title); - g_strfreev (profile->priv->warnings); - if (profile->priv->proxy != NULL) { - g_signal_handlers_disconnect_by_func (profile->priv->proxy, + g_hash_table_unref (priv->metadata); + g_free (priv->object_path); + g_free (priv->id); + g_free (priv->filename); + g_free (priv->qualifier); + g_free (priv->format); + g_free (priv->title); + g_strfreev (priv->warnings); + if (priv->proxy != NULL) { + g_signal_handlers_disconnect_by_func (priv->proxy, G_CALLBACK (cd_profile_dbus_signal_cb), profile); - g_signal_handlers_disconnect_by_func (profile->priv->proxy, + g_signal_handlers_disconnect_by_func (priv->proxy, G_CALLBACK (cd_profile_dbus_properties_changed_cb), profile); - g_object_unref (profile->priv->proxy); + g_object_unref (priv->proxy); } G_OBJECT_CLASS (cd_profile_parent_class)->finalize (object); diff -Nru colord-1.2.12/lib/colord/cd-profile.h colord-1.3.2/lib/colord/cd-profile.h --- colord-1.2.12/lib/colord/cd-profile.h 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-profile.h 2015-10-13 15:24:13.000000000 +0000 @@ -34,24 +34,13 @@ G_BEGIN_DECLS -#define CD_TYPE_PROFILE (cd_profile_get_type ()) -#define CD_PROFILE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_PROFILE, CdProfile)) -#define CD_PROFILE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_PROFILE, CdProfileClass)) -#define CD_IS_PROFILE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_PROFILE)) -#define CD_IS_PROFILE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_PROFILE)) -#define CD_PROFILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_PROFILE, CdProfileClass)) #define CD_PROFILE_ERROR (cd_profile_error_quark ()) #define CD_PROFILE_TYPE_ERROR (cd_profile_error_get_type ()) -typedef struct _CdProfilePrivate CdProfilePrivate; +#define CD_TYPE_PROFILE (cd_profile_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdProfile, cd_profile, CD, PROFILE, GObject) -typedef struct -{ - GObject parent; - CdProfilePrivate *priv; -} CdProfile; - -typedef struct +struct _CdProfileClass { GObjectClass parent_class; void (*changed) (CdProfile *profile); @@ -65,9 +54,8 @@ void (*_cd_profile_reserved6) (void); void (*_cd_profile_reserved7) (void); void (*_cd_profile_reserved8) (void); -} CdProfileClass; +}; -GType cd_profile_get_type (void); GQuark cd_profile_error_quark (void); CdProfile *cd_profile_new (void); CdProfile *cd_profile_new_with_object_path (const gchar *object_path); diff -Nru colord-1.2.12/lib/colord/cd-sensor.c colord-1.3.2/lib/colord/cd-sensor.c --- colord-1.2.12/lib/colord/cd-sensor.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-sensor.c 2016-03-15 12:26:52.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2010-2012 Richard Hughes + * Copyright (C) 2010-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -36,14 +36,13 @@ #include #include -#include "cd-cleanup.h" #include "cd-sensor.h" static void cd_sensor_class_init (CdSensorClass *klass); static void cd_sensor_init (CdSensor *sensor); static void cd_sensor_finalize (GObject *object); -#define CD_SENSOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_SENSOR, CdSensorPrivate)) +#define GET_PRIVATE(o) (cd_sensor_get_instance_private (o)) #define COLORD_DBUS_SERVICE "org.freedesktop.ColorManager" #define COLORD_DBUS_INTERFACE_SENSOR "org.freedesktop.ColorManager.Sensor" @@ -53,7 +52,7 @@ * * Private #CdSensor data **/ -struct _CdSensorPrivate +typedef struct { gchar *object_path; gchar *id; @@ -70,7 +69,7 @@ GHashTable *options; GHashTable *metadata; GDBusProxy *proxy; -}; +} CdSensorPrivate; enum { PROP_0, @@ -96,7 +95,7 @@ static guint signals [SIGNAL_LAST] = { 0 }; -G_DEFINE_TYPE (CdSensor, cd_sensor, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdSensor, cd_sensor, G_TYPE_OBJECT) /** * cd_sensor_error_quark: @@ -126,9 +125,10 @@ void cd_sensor_set_object_path (CdSensor *sensor, const gchar *object_path) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_if_fail (CD_IS_SENSOR (sensor)); - g_return_if_fail (sensor->priv->object_path == NULL); - sensor->priv->object_path = g_strdup (object_path); + g_return_if_fail (priv->object_path == NULL); + priv->object_path = g_strdup (object_path); } /** @@ -144,9 +144,10 @@ CdSensorKind cd_sensor_get_kind (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), CD_SENSOR_KIND_UNKNOWN); - g_return_val_if_fail (sensor->priv->proxy != NULL, CD_SENSOR_KIND_UNKNOWN); - return sensor->priv->kind; + g_return_val_if_fail (priv->proxy != NULL, CD_SENSOR_KIND_UNKNOWN); + return priv->kind; } /** @@ -162,9 +163,10 @@ CdSensorState cd_sensor_get_state (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), CD_SENSOR_STATE_UNKNOWN); - g_return_val_if_fail (sensor->priv->proxy != NULL, CD_SENSOR_STATE_UNKNOWN); - return sensor->priv->state; + g_return_val_if_fail (priv->proxy != NULL, CD_SENSOR_STATE_UNKNOWN); + return priv->state; } /** @@ -180,9 +182,10 @@ CdSensorCap cd_sensor_get_mode (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), CD_SENSOR_CAP_UNKNOWN); - g_return_val_if_fail (sensor->priv->proxy != NULL, CD_SENSOR_CAP_UNKNOWN); - return sensor->priv->mode; + g_return_val_if_fail (priv->proxy != NULL, CD_SENSOR_CAP_UNKNOWN); + return priv->mode; } /** @@ -198,9 +201,10 @@ const gchar * cd_sensor_get_serial (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (sensor->priv->proxy != NULL, NULL); - return sensor->priv->serial; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->serial; } /** @@ -216,9 +220,10 @@ const gchar * cd_sensor_get_model (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (sensor->priv->proxy != NULL, NULL); - return sensor->priv->model; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->model; } /** @@ -234,9 +239,10 @@ const gchar * cd_sensor_get_vendor (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (sensor->priv->proxy != NULL, NULL); - return sensor->priv->vendor; + g_return_val_if_fail (priv->proxy != NULL, NULL); + return priv->vendor; } /** @@ -252,9 +258,10 @@ gboolean cd_sensor_get_native (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (sensor->priv->proxy != NULL, FALSE); - return sensor->priv->native; + g_return_val_if_fail (priv->proxy != NULL, FALSE); + return priv->native; } /** @@ -270,9 +277,10 @@ gboolean cd_sensor_get_embedded (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (sensor->priv->proxy != NULL, FALSE); - return sensor->priv->embedded; + g_return_val_if_fail (priv->proxy != NULL, FALSE); + return priv->embedded; } /** @@ -288,9 +296,10 @@ gboolean cd_sensor_get_locked (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (sensor->priv->proxy != NULL, FALSE); - return sensor->priv->locked; + g_return_val_if_fail (priv->proxy != NULL, FALSE); + return priv->locked; } /** @@ -306,9 +315,10 @@ guint64 cd_sensor_get_caps (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), 0); - g_return_val_if_fail (sensor->priv->proxy != NULL, 0); - return sensor->priv->caps; + g_return_val_if_fail (priv->proxy != NULL, 0); + return priv->caps; } /** @@ -325,9 +335,10 @@ gboolean cd_sensor_has_cap (CdSensor *sensor, CdSensorCap cap) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (sensor->priv->proxy != NULL, FALSE); - return cd_bitfield_contain (sensor->priv->caps, cap); + g_return_val_if_fail (priv->proxy != NULL, FALSE); + return cd_bitfield_contain (priv->caps, cap); } /** @@ -336,16 +347,17 @@ static void cd_sensor_set_caps_from_variant (CdSensor *sensor, GVariant *variant) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); const gchar **caps_tmp; guint i; /* remove old entries */ - sensor->priv->caps = 0; + priv->caps = 0; /* insert the new metadata */ caps_tmp = g_variant_get_strv (variant, NULL); for (i = 0; caps_tmp[i] != NULL; i++) { - cd_bitfield_add (sensor->priv->caps, + cd_bitfield_add (priv->caps, cd_sensor_cap_from_string (caps_tmp[i])); } g_free (caps_tmp); @@ -357,18 +369,19 @@ static void cd_sensor_set_options_from_variant (CdSensor *sensor, GVariant *variant) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); const gchar *prop_key; GVariantIter iter; GVariant *prop_value; /* remove old entries */ - g_hash_table_remove_all (sensor->priv->options); + g_hash_table_remove_all (priv->options); /* insert the new options */ g_variant_iter_init (&iter, variant); while (g_variant_iter_loop (&iter, "{sv}", &prop_key, &prop_value)) { - g_hash_table_insert (sensor->priv->options, + g_hash_table_insert (priv->options, g_strdup (prop_key), g_variant_ref (prop_value)); @@ -381,18 +394,19 @@ static void cd_sensor_set_metadata_from_variant (CdSensor *sensor, GVariant *variant) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); GVariantIter iter; const gchar *prop_key; const gchar *prop_value; /* remove old entries */ - g_hash_table_remove_all (sensor->priv->metadata); + g_hash_table_remove_all (priv->metadata); /* insert the new metadata */ g_variant_iter_init (&iter, variant); while (g_variant_iter_loop (&iter, "{ss}", &prop_key, &prop_value)) { - g_hash_table_insert (sensor->priv->metadata, + g_hash_table_insert (priv->metadata, g_strdup (prop_key), g_strdup (prop_value)); @@ -408,6 +422,7 @@ const gchar * const *invalidated_properties, CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); guint i; guint len; GVariantIter iter; @@ -423,38 +438,38 @@ &property_name, &property_value); if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_KIND) == 0) { - sensor->priv->kind = cd_sensor_kind_from_string (g_variant_get_string (property_value, NULL)); + priv->kind = cd_sensor_kind_from_string (g_variant_get_string (property_value, NULL)); g_object_notify (G_OBJECT (sensor), "kind"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_STATE) == 0) { - sensor->priv->state = cd_sensor_state_from_string (g_variant_get_string (property_value, NULL)); + priv->state = cd_sensor_state_from_string (g_variant_get_string (property_value, NULL)); g_object_notify (G_OBJECT (sensor), "state"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_MODE) == 0) { - sensor->priv->mode = cd_sensor_cap_from_string (g_variant_get_string (property_value, NULL)); + priv->mode = cd_sensor_cap_from_string (g_variant_get_string (property_value, NULL)); g_object_notify (G_OBJECT (sensor), "mode"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_SERIAL) == 0) { - g_free (sensor->priv->serial); - sensor->priv->serial = g_variant_dup_string (property_value, NULL); + g_free (priv->serial); + priv->serial = g_variant_dup_string (property_value, NULL); g_object_notify (G_OBJECT (sensor), "serial"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_MODEL) == 0) { - g_free (sensor->priv->model); - sensor->priv->model = g_variant_dup_string (property_value, NULL); + g_free (priv->model); + priv->model = g_variant_dup_string (property_value, NULL); g_object_notify (G_OBJECT (sensor), "model"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_VENDOR) == 0) { - g_free (sensor->priv->vendor); - sensor->priv->vendor = g_variant_dup_string (property_value, NULL); + g_free (priv->vendor); + priv->vendor = g_variant_dup_string (property_value, NULL); g_object_notify (G_OBJECT (sensor), "vendor"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_ID) == 0) { - g_free (sensor->priv->id); - sensor->priv->id = g_variant_dup_string (property_value, NULL); + g_free (priv->id); + priv->id = g_variant_dup_string (property_value, NULL); g_object_notify (G_OBJECT (sensor), "id"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_NATIVE) == 0) { - sensor->priv->native = g_variant_get_boolean (property_value); + priv->native = g_variant_get_boolean (property_value); g_object_notify (G_OBJECT (sensor), "native"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_EMBEDDED) == 0) { - sensor->priv->embedded = g_variant_get_boolean (property_value); + priv->embedded = g_variant_get_boolean (property_value); g_object_notify (G_OBJECT (sensor), "embedded"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_LOCKED) == 0) { - sensor->priv->locked = g_variant_get_boolean (property_value); + priv->locked = g_variant_get_boolean (property_value); g_object_notify (G_OBJECT (sensor), "locked"); } else if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_CAPABILITIES) == 0) { cd_sensor_set_caps_from_variant (sensor, property_value); @@ -499,121 +514,121 @@ GAsyncResult *res, gpointer user_data) { - CdSensor *sensor = CD_SENSOR (g_async_result_get_source_object (G_ASYNC_RESULT (user_data))); - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *caps = NULL; - _cleanup_variant_unref_ GVariant *embedded = NULL; - _cleanup_variant_unref_ GVariant *id = NULL; - _cleanup_variant_unref_ GVariant *kind = NULL; - _cleanup_variant_unref_ GVariant *locked = NULL; - _cleanup_variant_unref_ GVariant *metadata = NULL; - _cleanup_variant_unref_ GVariant *model = NULL; - _cleanup_variant_unref_ GVariant *mode = NULL; - _cleanup_variant_unref_ GVariant *native = NULL; - _cleanup_variant_unref_ GVariant *serial = NULL; - _cleanup_variant_unref_ GVariant *state = NULL; - _cleanup_variant_unref_ GVariant *vendor = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) caps = NULL; + g_autoptr(GVariant) embedded = NULL; + g_autoptr(GVariant) id = NULL; + g_autoptr(GVariant) kind = NULL; + g_autoptr(GVariant) locked = NULL; + g_autoptr(GVariant) metadata = NULL; + g_autoptr(GVariant) model = NULL; + g_autoptr(GVariant) mode = NULL; + g_autoptr(GVariant) native = NULL; + g_autoptr(GVariant) serial = NULL; + g_autoptr(GVariant) state = NULL; + g_autoptr(GVariant) vendor = NULL; + CdSensor *sensor = CD_SENSOR (g_task_get_source_object (task)); + CdSensorPrivate *priv = GET_PRIVATE (sensor); /* get result */ - sensor->priv->proxy = g_dbus_proxy_new_for_bus_finish (res, &error); - if (sensor->priv->proxy == NULL) { - g_simple_async_result_set_error (res_source, - CD_SENSOR_ERROR, - CD_SENSOR_ERROR_INTERNAL, - "Failed to connect to sensor %s: %s", - cd_sensor_get_object_path (sensor), - error->message); - g_simple_async_result_complete (res_source); + priv->proxy = g_dbus_proxy_new_for_bus_finish (res, &error); + if (priv->proxy == NULL) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "Failed to connect to sensor %s: %s", + cd_sensor_get_object_path (sensor), + error->message); return; } /* get kind */ - kind = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + kind = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_KIND); if (kind != NULL) - sensor->priv->kind = cd_sensor_kind_from_string (g_variant_get_string (kind, NULL)); + priv->kind = cd_sensor_kind_from_string (g_variant_get_string (kind, NULL)); /* get state */ - state = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + state = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_STATE); if (state != NULL) - sensor->priv->state = cd_colorspace_from_string (g_variant_get_string (state, NULL)); + priv->state = cd_colorspace_from_string (g_variant_get_string (state, NULL)); /* get mode */ - mode = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + mode = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_MODE); if (mode != NULL) - sensor->priv->mode = cd_sensor_cap_from_string (g_variant_get_string (state, NULL)); + priv->mode = cd_sensor_cap_from_string (g_variant_get_string (state, NULL)); /* get sensor serial */ - serial = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + serial = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_SERIAL); if (serial != NULL) - sensor->priv->serial = g_variant_dup_string (serial, NULL); + priv->serial = g_variant_dup_string (serial, NULL); /* get vendor */ - vendor = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + vendor = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_VENDOR); if (vendor != NULL) - sensor->priv->vendor = g_variant_dup_string (vendor, NULL); + priv->vendor = g_variant_dup_string (vendor, NULL); /* get model */ - model = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + model = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_MODEL); if (model != NULL) - sensor->priv->model = g_variant_dup_string (model, NULL); + priv->model = g_variant_dup_string (model, NULL); /* get id */ - id = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + id = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_ID); if (id != NULL) - sensor->priv->id = g_variant_dup_string (id, NULL); + priv->id = g_variant_dup_string (id, NULL); /* get native */ - native = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + native = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_NATIVE); if (native != NULL) - sensor->priv->native = g_variant_get_boolean (native); + priv->native = g_variant_get_boolean (native); /* get embedded */ - embedded = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + embedded = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_EMBEDDED); if (embedded != NULL) - sensor->priv->embedded = g_variant_get_boolean (embedded); + priv->embedded = g_variant_get_boolean (embedded); /* get locked */ - locked = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + locked = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_LOCKED); if (locked != NULL) - sensor->priv->locked = g_variant_get_boolean (locked); + priv->locked = g_variant_get_boolean (locked); /* get if system wide */ - caps = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + caps = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_CAPABILITIES); if (caps != NULL) cd_sensor_set_caps_from_variant (sensor, caps); /* get metadata */ - metadata = g_dbus_proxy_get_cached_property (sensor->priv->proxy, + metadata = g_dbus_proxy_get_cached_property (priv->proxy, CD_SENSOR_PROPERTY_METADATA); if (metadata != NULL) cd_sensor_set_metadata_from_variant (sensor, metadata); /* get signals from DBus */ - g_signal_connect (sensor->priv->proxy, - "g-signal", - G_CALLBACK (cd_sensor_dbus_signal_cb), - sensor); + g_signal_connect_object (priv->proxy, + "g-signal", + G_CALLBACK (cd_sensor_dbus_signal_cb), + sensor, 0); /* watch if any remote properties change */ - g_signal_connect (sensor->priv->proxy, - "g-properties-changed", - G_CALLBACK (cd_sensor_dbus_properties_changed_cb), - sensor); + g_signal_connect_object (priv->proxy, + "g-properties-changed", + G_CALLBACK (cd_sensor_dbus_properties_changed_cb), + sensor, 0); /* we're done */ - g_simple_async_result_complete (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -633,21 +648,18 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + GTask *task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); g_return_if_fail (callback != NULL); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_connect); + task = g_task_new (sensor, cancellable, callback, user_data); /* already connected */ - if (sensor->priv->proxy != NULL) { - g_simple_async_result_set_op_res_gboolean (res, TRUE); - g_simple_async_result_complete_in_idle (res); + if (priv->proxy != NULL) { + g_task_return_boolean (task, TRUE); return; } @@ -656,11 +668,11 @@ G_DBUS_PROXY_FLAGS_NONE, NULL, COLORD_DBUS_SERVICE, - sensor->priv->object_path, + priv->object_path, COLORD_DBUS_INTERFACE_SENSOR, cancellable, cd_sensor_connect_cb, - res); + task); } /** @@ -680,22 +692,8 @@ GAsyncResult *res, GError **error) { - gpointer source_tag; - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - source_tag = g_simple_async_result_get_source_tag (simple); - - g_return_val_if_fail (source_tag == cd_sensor_connect, FALSE); - - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return TRUE; + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } /**********************************************************************/ @@ -717,17 +715,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } /** @@ -736,7 +725,7 @@ static void cd_sensor_fixup_dbus_error (GError *error) { - _cleanup_free_ gchar *name = NULL; + g_autofree gchar *name = NULL; g_return_if_fail (error != NULL); @@ -756,23 +745,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_sensor_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -792,24 +780,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + GTask *task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (sensor->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_lock); - g_dbus_proxy_call (sensor->priv->proxy, + task = g_task_new (sensor, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "Lock", NULL, G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_sensor_lock_cb, - res); + task); } /**********************************************************************/ @@ -831,17 +817,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -849,23 +826,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_sensor_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -885,24 +861,22 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + GTask *task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (sensor->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_unlock); - g_dbus_proxy_call (sensor->priv->proxy, + task = g_task_new (sensor, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "Unlock", NULL, G_DBUS_CALL_FLAGS_NONE, -1, cancellable, cd_sensor_unlock_cb, - res); + task); } /**********************************************************************/ @@ -924,17 +898,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -942,23 +907,22 @@ GAsyncResult *res, gpointer user_data) { - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_sensor_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } /* success */ - g_simple_async_result_set_op_res_gboolean (res_source, TRUE); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_boolean (task, TRUE); } /** @@ -980,18 +944,15 @@ GAsyncReadyCallback callback, gpointer user_data) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); GList *list, *l; - GSimpleAsyncResult *res; - GVariantBuilder builder; + GTask *task = NULL; GVariantBuilder builder; g_return_if_fail (CD_IS_SENSOR (sensor)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (sensor->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_set_options); + task = g_task_new (sensor, cancellable, callback, user_data); /* convert the hash table to an array of {sv} */ g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); @@ -1005,7 +966,7 @@ } g_list_free (list); - g_dbus_proxy_call (sensor->priv->proxy, + g_dbus_proxy_call (priv->proxy, "SetOptions", g_variant_new ("(a{sv})", &builder), @@ -1013,7 +974,7 @@ -1, cancellable, cd_sensor_set_options_cb, - res); + task); } /**********************************************************************/ @@ -1035,17 +996,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - return cd_color_xyz_dup (g_simple_async_result_get_op_res_gpointer (simple)); + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1054,17 +1006,17 @@ gpointer user_data) { CdColorXYZ *xyz; - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GSimpleAsyncResult *res_source = G_SIMPLE_ASYNC_RESULT (user_data); - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error); if (result == NULL) { cd_sensor_fixup_dbus_error (error); - g_simple_async_result_set_from_error (res_source, error); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_error (task, error); + error = NULL; return; } @@ -1076,10 +1028,7 @@ &xyz->Y, &xyz->Z); - g_simple_async_result_set_op_res_gpointer (res_source, - xyz, - (GDestroyNotify) cd_color_xyz_free); - g_simple_async_result_complete_in_idle (res_source); + g_task_return_pointer (task, xyz, (GDestroyNotify) cd_color_xyz_free); } /** @@ -1101,17 +1050,15 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + GTask *task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (sensor->priv->proxy != NULL); + g_return_if_fail (priv->proxy != NULL); - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_get_sample); - g_dbus_proxy_call (sensor->priv->proxy, + task = g_task_new (sensor, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, "GetSample", g_variant_new ("(s)", cd_sensor_cap_to_string (cap)), @@ -1119,7 +1066,108 @@ -1, cancellable, cd_sensor_get_sample_cb, - res); + task); +} + +/**********************************************************************/ + +/** + * cd_sensor_get_spectrum_finish: + * @sensor: a #CdSensor instance. + * @res: the #GAsyncResult + * @error: A #GError or %NULL + * + * Gets the result from the asynchronous function. + * + * Return value: the XYZ reading, or %NULL + * + * Since: 1.3.1 + **/ +CdSpectrum * +cd_sensor_get_spectrum_finish (CdSensor *sensor, + GAsyncResult *res, + GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); +} + +static void +cd_sensor_get_spectrum_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + CdSpectrum *sp; + GVariantIter iter; + gdouble sp_start = 0.f; + gdouble sp_end = 0.f; + gdouble tmp; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + g_autoptr(GVariant) result = NULL; + g_autoptr(GVariant) data = NULL; + + result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), + res, + &error); + if (result == NULL) { + cd_sensor_fixup_dbus_error (error); + g_task_return_error (task, error); + error = NULL; + return; + } + + /* create object from data */ + sp = cd_spectrum_new (); + g_variant_get_child (result, 0, "d", &sp_start); + g_variant_get_child (result, 1, "d", &sp_end); + cd_spectrum_set_start (sp, sp_start); + cd_spectrum_set_end (sp, sp_end); + data = g_variant_get_child_value (result, 2); + g_variant_iter_init (&iter, data); + while (g_variant_iter_loop (&iter, "d", &tmp)) + cd_spectrum_add_value (sp, tmp); + + /* success */ + g_task_return_pointer (task, sp, (GDestroyNotify) cd_spectrum_free); +} + +/** + * cd_sensor_get_spectrum: + * @sensor: a #CdSensor instance. + * @cap: a #CdSensorCap + * @cancellable: a #GCancellable, or %NULL + * @callback: the function to run on completion + * @user_data: the data to pass to @callback + * + * Gets a color spectrum from a sensor + * + * Since: 1.3.1 + **/ +void +cd_sensor_get_spectrum (CdSensor *sensor, + CdSensorCap cap, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + CdSensorPrivate *priv = GET_PRIVATE (sensor); + GTask *task = NULL; + + g_return_if_fail (CD_IS_SENSOR (sensor)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + g_return_if_fail (priv->proxy != NULL); + + task = g_task_new (sensor, cancellable, callback, user_data); + g_dbus_proxy_call (priv->proxy, + "GetSpectrum", + g_variant_new ("(s)", + cd_sensor_cap_to_string (cap)), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + cd_sensor_get_spectrum_cb, + task); } /**********************************************************************/ @@ -1137,8 +1185,9 @@ const gchar * cd_sensor_get_object_path (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - return sensor->priv->object_path; + return priv->object_path; } /** @@ -1154,8 +1203,9 @@ const gchar * cd_sensor_get_id (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - return sensor->priv->id; + return priv->id; } /** @@ -1171,8 +1221,9 @@ gboolean cd_sensor_get_connected (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - return sensor->priv->proxy != NULL; + return priv->proxy != NULL; } /** @@ -1189,8 +1240,9 @@ GHashTable * cd_sensor_get_options (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - return g_hash_table_ref (sensor->priv->options); + return g_hash_table_ref (priv->options); } /** @@ -1207,8 +1259,9 @@ const gchar * cd_sensor_get_option (CdSensor *sensor, const gchar *key) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - return g_hash_table_lookup (sensor->priv->options, key); + return g_hash_table_lookup (priv->options, key); } /** @@ -1225,9 +1278,10 @@ GHashTable * cd_sensor_get_metadata (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (sensor->priv->proxy != NULL, NULL); - return g_hash_table_ref (sensor->priv->metadata); + g_return_val_if_fail (priv->proxy != NULL, NULL); + return g_hash_table_ref (priv->metadata); } /** @@ -1244,9 +1298,10 @@ const gchar * cd_sensor_get_metadata_item (CdSensor *sensor, const gchar *key) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (sensor->priv->proxy != NULL, NULL); - return g_hash_table_lookup (sensor->priv->metadata, key); + g_return_val_if_fail (priv->proxy != NULL, NULL); + return g_hash_table_lookup (priv->metadata, key); } /** @@ -1263,9 +1318,11 @@ gboolean cd_sensor_equal (CdSensor *sensor1, CdSensor *sensor2) { + CdSensorPrivate *priv1 = GET_PRIVATE (sensor1); + CdSensorPrivate *priv2 = GET_PRIVATE (sensor2); g_return_val_if_fail (CD_IS_SENSOR (sensor1), FALSE); g_return_val_if_fail (CD_IS_SENSOR (sensor2), FALSE); - return g_strcmp0 (sensor1->priv->serial, sensor2->priv->serial) == 0; + return g_strcmp0 (priv1->serial, priv2->serial) == 0; } /* @@ -1275,11 +1332,12 @@ cd_sensor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { CdSensor *sensor = CD_SENSOR (object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); switch (prop_id) { case PROP_OBJECT_PATH: - g_free (sensor->priv->object_path); - sensor->priv->object_path = g_value_dup_string (value); + g_free (priv->object_path); + priv->object_path = g_value_dup_string (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1294,43 +1352,44 @@ cd_sensor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { CdSensor *sensor = CD_SENSOR (object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); switch (prop_id) { case PROP_OBJECT_PATH: - g_value_set_string (value, sensor->priv->object_path); + g_value_set_string (value, priv->object_path); break; case PROP_ID: - g_value_set_string (value, sensor->priv->id); + g_value_set_string (value, priv->id); break; case PROP_CONNECTED: - g_value_set_boolean (value, sensor->priv->proxy != NULL); + g_value_set_boolean (value, priv->proxy != NULL); break; case PROP_KIND: - g_value_set_uint (value, sensor->priv->kind); + g_value_set_uint (value, priv->kind); break; case PROP_STATE: - g_value_set_uint (value, sensor->priv->state); + g_value_set_uint (value, priv->state); break; case PROP_MODE: - g_value_set_uint (value, sensor->priv->mode); + g_value_set_uint (value, priv->mode); break; case PROP_SERIAL: - g_value_set_string (value, sensor->priv->serial); + g_value_set_string (value, priv->serial); break; case PROP_MODEL: - g_value_set_string (value, sensor->priv->model); + g_value_set_string (value, priv->model); break; case PROP_VENDOR: - g_value_set_string (value, sensor->priv->vendor); + g_value_set_string (value, priv->vendor); break; case PROP_NATIVE: - g_value_set_boolean (value, sensor->priv->native); + g_value_set_boolean (value, priv->native); break; case PROP_EMBEDDED: - g_value_set_boolean (value, sensor->priv->embedded); + g_value_set_boolean (value, priv->embedded); break; case PROP_LOCKED: - g_value_set_boolean (value, sensor->priv->locked); + g_value_set_boolean (value, priv->locked); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1526,8 +1585,6 @@ NULL, NULL, NULL, G_PARAM_READABLE)); - - g_type_class_add_private (klass, sizeof (CdSensorPrivate)); } /* @@ -1536,12 +1593,12 @@ static void cd_sensor_init (CdSensor *sensor) { - sensor->priv = CD_SENSOR_GET_PRIVATE (sensor); - sensor->priv->options = g_hash_table_new_full (g_str_hash, + CdSensorPrivate *priv = GET_PRIVATE (sensor); + priv->options = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) g_variant_unref); - sensor->priv->metadata = g_hash_table_new_full (g_str_hash, + priv->metadata = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); @@ -1553,31 +1610,29 @@ static void cd_sensor_finalize (GObject *object) { - CdSensor *sensor; + CdSensor *sensor = CD_SENSOR (object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); guint ret; g_return_if_fail (CD_IS_SENSOR (object)); - sensor = CD_SENSOR (object); - - g_free (sensor->priv->object_path); - g_free (sensor->priv->id); - g_free (sensor->priv->serial); - g_free (sensor->priv->model); - g_free (sensor->priv->vendor); - g_hash_table_unref (sensor->priv->options); - g_hash_table_destroy (sensor->priv->metadata); - if (sensor->priv->proxy != NULL) { - ret = g_signal_handlers_disconnect_by_func (sensor->priv->proxy, + g_free (priv->object_path); + g_free (priv->id); + g_free (priv->serial); + g_free (priv->model); + g_free (priv->vendor); + g_hash_table_unref (priv->options); + g_hash_table_destroy (priv->metadata); + if (priv->proxy != NULL) { + ret = g_signal_handlers_disconnect_by_func (priv->proxy, G_CALLBACK (cd_sensor_dbus_signal_cb), sensor); g_assert (ret > 0); - ret = g_signal_handlers_disconnect_by_func (sensor->priv->proxy, + ret = g_signal_handlers_disconnect_by_func (priv->proxy, G_CALLBACK (cd_sensor_dbus_properties_changed_cb), sensor); g_assert (ret > 0); - g_object_unref (sensor->priv->proxy); - g_assert (!G_IS_DBUS_PROXY (sensor->priv->proxy)); + g_object_unref (priv->proxy); } G_OBJECT_CLASS (cd_sensor_parent_class)->finalize (object); diff -Nru colord-1.2.12/lib/colord/cd-sensor.h colord-1.3.2/lib/colord/cd-sensor.h --- colord-1.2.12/lib/colord/cd-sensor.h 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-sensor.h 2015-10-16 11:04:50.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2010-2012 Richard Hughes + * Copyright (C) 2010-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -31,27 +31,17 @@ #include "cd-enum.h" #include "cd-color.h" +#include "cd-spectrum.h" G_BEGIN_DECLS -#define CD_TYPE_SENSOR (cd_sensor_get_type ()) -#define CD_SENSOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_SENSOR, CdSensor)) -#define CD_SENSOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_SENSOR, CdSensorClass)) -#define CD_IS_SENSOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_SENSOR)) -#define CD_IS_SENSOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_SENSOR)) -#define CD_SENSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_SENSOR, CdSensorClass)) #define CD_SENSOR_ERROR (cd_sensor_error_quark ()) #define CD_SENSOR_TYPE_ERROR (cd_sensor_error_get_type ()) -typedef struct _CdSensorPrivate CdSensorPrivate; +#define CD_TYPE_SENSOR (cd_sensor_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdSensor, cd_sensor, CD, SENSOR, GObject) -typedef struct -{ - GObject parent; - CdSensorPrivate *priv; -} CdSensor; - -typedef struct +struct _CdSensorClass { GObjectClass parent_class; void (*button_pressed) (CdSensor *sensor); @@ -65,9 +55,8 @@ void (*_cd_sensor_reserved6) (void); void (*_cd_sensor_reserved7) (void); void (*_cd_sensor_reserved8) (void); -} CdSensorClass; +}; -GType cd_sensor_get_type (void); GQuark cd_sensor_error_quark (void); CdSensor *cd_sensor_new (void); CdSensor *cd_sensor_new_with_object_path (const gchar *object_path); @@ -115,6 +104,15 @@ GAsyncResult *res, GError **error) G_GNUC_WARN_UNUSED_RESULT; +void cd_sensor_get_spectrum (CdSensor *sensor, + CdSensorCap cap, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +CdSpectrum *cd_sensor_get_spectrum_finish (CdSensor *sensor, + GAsyncResult *res, + GError **error) + G_GNUC_WARN_UNUSED_RESULT; /* getters */ const gchar *cd_sensor_get_object_path (CdSensor *sensor); diff -Nru colord-1.2.12/lib/colord/cd-sensor-sync.c colord-1.3.2/lib/colord/cd-sensor-sync.c --- colord-1.2.12/lib/colord/cd-sensor-sync.c 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-sensor-sync.c 2015-10-16 11:04:50.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2011-2012 Richard Hughes + * Copyright (C) 2011-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -44,6 +44,7 @@ GMainLoop *loop; gboolean ret; CdColorXYZ *sample; + CdSpectrum *spectrum; } CdSensorHelper; static void @@ -309,3 +310,57 @@ } /**********************************************************************/ + +static void +cd_sensor_get_spectrum_finish_sync (CdSensor *sensor, + GAsyncResult *res, + CdSensorHelper *helper) +{ + helper->spectrum = cd_sensor_get_spectrum_finish (sensor, + res, + helper->error); + g_main_loop_quit (helper->loop); +} + +/** + * cd_sensor_get_spectrum_sync: + * @sensor: a #CdSensor instance. + * @cap: The device capability, e.g. %CD_SENSOR_CAP_AMBIENT. + * @cancellable: a #GCancellable or %NULL + * @error: a #GError, or %NULL. + * + * Gets a spectrum from the sensor. + * + * WARNING: This function is synchronous, and may block. + * Do not use it in GUI applications. + * + * Return value: the XYZ reading, with ambient levels in Lux encoded in X, or %NULL for error. + * + * Since: 1.3.1 + **/ +CdSpectrum * +cd_sensor_get_spectrum_sync (CdSensor *sensor, + CdSensorCap cap, + GCancellable *cancellable, + GError **error) +{ + CdSensorHelper helper; + + /* create temp object */ + memset (&helper, 0, sizeof (CdSensorHelper)); + helper.loop = g_main_loop_new (NULL, FALSE); + helper.error = error; + + /* run async method */ + cd_sensor_get_spectrum (sensor, cap, cancellable, + (GAsyncReadyCallback) cd_sensor_get_spectrum_finish_sync, + &helper); + g_main_loop_run (helper.loop); + + /* free temp object */ + g_main_loop_unref (helper.loop); + + return helper.spectrum; +} + +/**********************************************************************/ diff -Nru colord-1.2.12/lib/colord/cd-sensor-sync.h colord-1.3.2/lib/colord/cd-sensor-sync.h --- colord-1.2.12/lib/colord/cd-sensor-sync.h 2015-04-22 09:56:49.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-sensor-sync.h 2015-10-16 11:04:50.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2011-2012 Richard Hughes + * Copyright (C) 2011-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -53,6 +53,11 @@ CdSensorCap cap, GCancellable *cancellable, GError **error) + G_GNUC_WARN_UNUSED_RESULT; +CdSpectrum *cd_sensor_get_spectrum_sync (CdSensor *sensor, + CdSensorCap cap, + GCancellable *cancellable, + GError **error) G_GNUC_WARN_UNUSED_RESULT; G_END_DECLS diff -Nru colord-1.2.12/lib/colord/cd-spectrum.c colord-1.3.2/lib/colord/cd-spectrum.c --- colord-1.2.12/lib/colord/cd-spectrum.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-spectrum.c 2015-10-26 15:53:31.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2014 Richard Hughes + * Copyright (C) 2014-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -31,7 +31,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-color.h" #include "cd-interp-linear.h" #include "cd-spectrum.h" @@ -43,6 +42,7 @@ gdouble start; gdouble end; gdouble norm; + gdouble wavelength_cal[3]; GArray *data; }; @@ -70,6 +70,8 @@ tmp = cd_spectrum_get_value_raw (spectrum, i); cd_spectrum_add_value (dest, tmp); } + for (i = 0; i < 3; i++) + dest->wavelength_cal[i] = spectrum->wavelength_cal[i]; return dest; } @@ -110,6 +112,42 @@ } /** + * cd_spectrum_get_value_max: + * @spectrum: a #CdSpectrum instance. + * + * Gets the largest normalised value in the spectrum. + * + * Since: 1.3.1 + **/ +gdouble +cd_spectrum_get_value_max (const CdSpectrum *spectrum) +{ + gdouble max = 0.f; + guint i; + for (i = 0; i < cd_spectrum_get_size (spectrum); i++) + max = MAX (max, cd_spectrum_get_value (spectrum, i)); + return max; +} + +/** + * cd_spectrum_get_value_min: + * @spectrum: a #CdSpectrum instance. + * + * Gets the smallest normalised value in the spectrum. + * + * Since: 1.3.1 + **/ +gdouble +cd_spectrum_get_value_min (const CdSpectrum *spectrum) +{ + gdouble min = G_MAXDOUBLE; + guint i; + for (i = 0; i < cd_spectrum_get_size (spectrum); i++) + min = MIN (min, cd_spectrum_get_value (spectrum, i)); + return min; +} + +/** * cd_spectrum_set_value: * @spectrum: a #CdSpectrum instance. * @idx: an index into the data @@ -161,20 +199,27 @@ gdouble cd_spectrum_get_wavelength (const CdSpectrum *spectrum, guint idx) { - gdouble step; - guint number_points; - g_return_val_if_fail (spectrum != NULL, -1.0f); - /* if we used cd_spectrum_size_new() and there is no data we can infer - * the wavelenth based on the declared initial size */ - if (spectrum->reserved_size > 0) - number_points = spectrum->reserved_size; - else - number_points = spectrum->data->len; + /* fall back to the old method */ + if (spectrum->wavelength_cal[0] < 0) { + gdouble step; + guint number_points; + /* if we used cd_spectrum_size_new() and there is no data we can infer + * the wavelenth based on the declared initial size */ + if (spectrum->reserved_size > 0) + number_points = spectrum->reserved_size; + else + number_points = spectrum->data->len; + step = (spectrum->end - spectrum->start) / (number_points - 1); + return spectrum->start + (step * (gdouble) idx); + } - step = (spectrum->end - spectrum->start) / (number_points - 1); - return spectrum->start + (step * (gdouble) idx); + /* use wavelength_cal to work out wavelength */ + return spectrum->start + + spectrum->wavelength_cal[0] * (gdouble) idx + + spectrum->wavelength_cal[1] * pow (idx, 2) + + spectrum->wavelength_cal[2] * pow (idx, 3); } /** @@ -317,6 +362,7 @@ spectrum = g_slice_new0 (CdSpectrum); spectrum->norm = 1.f; spectrum->data = g_array_new (FALSE, FALSE, sizeof (gdouble)); + spectrum->wavelength_cal[0] = -1.f; return spectrum; } @@ -338,21 +384,28 @@ spectrum->norm = 1.f; spectrum->reserved_size = reserved_size; spectrum->data = g_array_sized_new (FALSE, FALSE, sizeof (gdouble), reserved_size); + spectrum->wavelength_cal[0] = -1.f; return spectrum; } /** - * cd_spectrum_planckian_new: + * cd_spectrum_planckian_new_full: * @temperature: the temperature in Kelvin + * @start: the new spectrum start + * @end: the new spectrum end + * @resolution: the resolution to use when resampling * * Allocates a Planckian spectrum at a specific temperature. * * Return value: A newly allocated #CdSpectrum object * - * Since: 1.1.6 + * Since: 1.3.1 **/ CdSpectrum * -cd_spectrum_planckian_new (gdouble temperature) +cd_spectrum_planckian_new_full (gdouble temperature, + gdouble start, + gdouble end, + gdouble resolution) { CdSpectrum *s = NULL; const gdouble c1 = 3.74183e-16; /* 2pi * h * c^2 */ @@ -369,8 +422,8 @@ /* create spectrum with 1nm resolution */ s = cd_spectrum_sized_new (531); s->id = g_strdup_printf ("Planckian@%.0fK", temperature); - cd_spectrum_set_start (s, 300); - cd_spectrum_set_end (s, 830); + cd_spectrum_set_start (s, start); + cd_spectrum_set_end (s, end); /* see http://www.create.uwe.ac.uk/ardtalks/Schanda_paper.pdf, page 42 */ wl = 560 * 1e-9; @@ -384,6 +437,22 @@ } /** + * cd_spectrum_planckian_new: + * @temperature: the temperature in Kelvin + * + * Allocates a Planckian spectrum at a specific temperature. + * + * Return value: A newly allocated #CdSpectrum object + * + * Since: 1.1.6 + **/ +CdSpectrum * +cd_spectrum_planckian_new (gdouble temperature) +{ + return cd_spectrum_planckian_new_full (temperature, 300, 830, 1); +} + +/** * cd_spectrum_add_value: * @spectrum: the spectrum * @@ -409,7 +478,8 @@ void cd_spectrum_free (CdSpectrum *spectrum) { - g_return_if_fail (spectrum != NULL); + if (spectrum == NULL) + return; g_free (spectrum->id); g_array_unref (spectrum->data); g_slice_free (CdSpectrum, spectrum); @@ -474,12 +544,25 @@ * * Set the end value of the spectal data in nm. * + * If there is already spectral data, the wavelength calibration will + * also be set automatically. + * * Since: 1.1.6 **/ void cd_spectrum_set_end (CdSpectrum *spectrum, gdouble end) { g_return_if_fail (spectrum != NULL); + + /* calculate the calibration co-efficients */ + if (spectrum->data->len > 1) { + spectrum->wavelength_cal[0] = (end - spectrum->start) / + (spectrum->data->len - 1); + spectrum->wavelength_cal[1] = 0.f; + spectrum->wavelength_cal[2] = 0.f; + } + + /* set this for later */ spectrum->end = end; } @@ -516,7 +599,7 @@ { guint i; guint size; - _cleanup_object_unref_ CdInterp *interp = NULL; + g_autoptr(CdInterp) interp = NULL; g_return_val_if_fail (spectrum != NULL, -1.f); @@ -544,6 +627,50 @@ } /** + * cd_spectrum_limit_min: + * @spectrum: a #CdSpectrum instance + * @value: the threshold value to limit the spectrum + * + * Ensures no values in the spectrum fall below a set limit. If they + * are found, set them to @value. + * + * Since: 1.3.1 + **/ +void +cd_spectrum_limit_min (CdSpectrum *spectrum, gdouble value) +{ + gdouble tmp; + guint i; + for (i = 0; i < spectrum->data->len; i++) { + tmp = cd_spectrum_get_value (spectrum, i); + if (tmp < value) + cd_spectrum_set_value (spectrum, i, value); + } +} + +/** + * cd_spectrum_limit_max: + * @spectrum: a #CdSpectrum instance + * @value: the threshold value to limit the spectrum + * + * Ensures no values in the spectrum fall above a set limit. If they + * are found, set them to @value. + * + * Since: 1.3.1 + **/ +void +cd_spectrum_limit_max (CdSpectrum *spectrum, gdouble value) +{ + gdouble tmp; + guint i; + for (i = 0; i < spectrum->data->len; i++) { + tmp = cd_spectrum_get_value (spectrum, i); + if (tmp > value) + cd_spectrum_set_value (spectrum, i, value); + } +} + +/** * cd_spectrum_normalize: * @spectrum: a #CdSpectrum instance * @wavelength: the wavelength in nm @@ -614,3 +741,213 @@ } return s; } + +/** + * cd_spectrum_subtract: + * @s1: a #CdSpectrum instance, e.g. a sample + * @s2: a #CdSpectrum instance, e.g. a dark calibration + * @resolution: the resolution to use when resampling + * + * Subtracts one spectral plot from another. If the spectra have the same start, + * end and the same number of data points they are not resampled. + * + * Return value: a #CdSpectrum instance + * + * Since: 1.3.1 + **/ +CdSpectrum * +cd_spectrum_subtract (CdSpectrum *s1, CdSpectrum *s2, gdouble resolution) +{ + CdSpectrum *s; + gdouble max; + gdouble min; + gdouble nm; + guint i; + + g_return_val_if_fail (s1 != NULL, NULL); + g_return_val_if_fail (s2 != NULL, NULL); + + /* we can do this without resampling */ + if (fabs (s1->start - s2->start) < 0.01f && + fabs (s1->end - s2->end) < 0.01f && + s1->data->len == s2->data->len) { + s = cd_spectrum_sized_new (s1->data->len); + s->id = g_strdup_printf ("%s-%s", s1->id, s2->id); + s->start = s1->start; + s->end = s1->end; + for (i = 0; i < 3; i++) + s->wavelength_cal[i] = s1->wavelength_cal[i]; + for (i = 0; i < s1->data->len; i++) { + gdouble tmp; + tmp = cd_spectrum_get_value (s1, i) - cd_spectrum_get_value (s2, i); + cd_spectrum_add_value (s, tmp); + } + return s; + } + + /* resample */ + min = MIN (cd_spectrum_get_start (s1), cd_spectrum_get_start (s2)); + max = MAX (cd_spectrum_get_end (s1), cd_spectrum_get_end (s2)); + s = cd_spectrum_new (); + s->id = g_strdup_printf ("%s-%s", s1->id, s2->id); + s->start = min; + s->end = max; + for (nm = min; nm <= max; nm += resolution) { + gdouble tmp; + tmp = cd_spectrum_get_value_for_nm (s1, nm) - + cd_spectrum_get_value_for_nm (s2, nm); + cd_spectrum_add_value (s, tmp); + } + return s; +} + +/** + * cd_spectrum_to_string: + * @spectrum: a #CdSpectrum instance + * @max_width: the terminal width + * @max_height: the terminal height + * + * Returns a graphical representation of the spectrum. + * + * Return value: a printable ASCII string + * + * Since: 1.3.1 + **/ +gchar * +cd_spectrum_to_string (CdSpectrum *spectrum, guint max_width, guint max_height) +{ + GString *str = g_string_new (""); + guint i, j; + gdouble val_max; + gdouble nm_scale; + + /* make space for the axes */ + max_width -= 9; + max_height -= 2; + + /* find value maximum */ + val_max = cd_spectrum_get_value_max (spectrum); + if (val_max < 0.001) + val_max = 0.001; + nm_scale = (cd_spectrum_get_end (spectrum) - + cd_spectrum_get_start (spectrum)) / (gdouble) (max_width - 1); + + /* draw grid */ + for (i = 0; i < max_height; i++) { + gdouble val; + val = val_max / (gdouble) max_height * (max_height - i); + g_string_append_printf (str, "%7.3f |", val); + for (j = 0; j < max_width; j++) { + gdouble nm; + nm = ((gdouble) j * nm_scale) + cd_spectrum_get_start (spectrum); + if (cd_spectrum_get_value_for_nm (spectrum, nm) >= val) + g_string_append (str, "#"); + else + g_string_append (str, "_"); + } + g_string_append (str, "\n"); + } + + /* draw x axis */ + g_string_append_printf (str, "%7.3f ", 0.f); + for (j = 0; j < max_width; j++) + g_string_append (str, "-"); + g_string_append (str, "\n"); + + /* draw X labels */ + g_string_append_printf (str, " %.0fnm", + cd_spectrum_get_start (spectrum)); + for (j = 0; j < max_width - 10; j++) + g_string_append (str, " "); + g_string_append_printf (str, "%.0fnm", + cd_spectrum_get_end (spectrum)); + g_string_append (str, "\n"); + + /* success */ + return g_string_free (str, FALSE); +} + +/** + * cd_spectrum_set_wavelength_cal: + * @spectrum: a #CdSpectrum instance + * @c1: the 1st coefficient + * @c2: the 2nd coefficient + * @c3: the 3rd coefficient + * + * Sets the calibration coefficients used to map pixel indexes to + * wavelengths. + * + * This function will set the 'end' wavelength automatically, + * potentially overwriting the value set by cd_spectrum_set_end(). + * + * Since: 1.3.1 + **/ +void +cd_spectrum_set_wavelength_cal (CdSpectrum *spectrum, + gdouble c1, gdouble c2, gdouble c3) +{ + spectrum->wavelength_cal[0] = c1; + spectrum->wavelength_cal[1] = c2; + spectrum->wavelength_cal[2] = c3; + + /* recalculate the end wavelength */ + spectrum->end = cd_spectrum_get_wavelength (spectrum, + cd_spectrum_get_size (spectrum) - 1); +} + +/** + * cd_spectrum_get_wavelength_cal: + * @spectrum: a #CdSpectrum instance + * @c1: the 1st coefficient + * @c2: the 2nd coefficient + * @c3: the 3rd coefficient + * + * Gets the calibration coefficients used to map pixel indexes to + * wavelengths. + * + * Since: 1.3.1 + **/ +void +cd_spectrum_get_wavelength_cal (CdSpectrum *spectrum, + gdouble *c1, gdouble *c2, gdouble *c3) +{ + if (c1 != NULL) + *c1 = spectrum->wavelength_cal[0]; + if (c2 != NULL) + *c2 = spectrum->wavelength_cal[1]; + if (c3 != NULL) + *c3 = spectrum->wavelength_cal[2]; +} + +/** + * cd_spectrum_resample: + * @spectrum: a #CdSpectrum instance + * @start: the new spectrum start + * @end: the new spectrum end + * @resolution: the resolution to use when resampling + * + * Resample a new spectrum with linear index to wavelength coefficients. + * + * Return value: a #CdSpectrum instance + * + * Since: 1.3.1 + **/ +CdSpectrum * +cd_spectrum_resample (CdSpectrum *spectrum, + gdouble start, + gdouble end, + gdouble resolution) +{ + gdouble nm; + CdSpectrum *sp; + + sp = cd_spectrum_new (); + cd_spectrum_set_start (sp, start); + for (nm = start; nm <= end; nm += resolution) { + gdouble tmp; + tmp = cd_spectrum_get_value_for_nm (spectrum, nm); + cd_spectrum_add_value (sp, tmp); + } + cd_spectrum_set_end (sp, end); + return sp; +} diff -Nru colord-1.2.12/lib/colord/cd-spectrum.h colord-1.3.2/lib/colord/cd-spectrum.h --- colord-1.2.12/lib/colord/cd-spectrum.h 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-spectrum.h 2016-01-06 12:07:32.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2014 Richard Hughes + * Copyright (C) 2014-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -38,13 +38,27 @@ CdSpectrum *cd_spectrum_new (void); CdSpectrum *cd_spectrum_sized_new (guint reserved_size); CdSpectrum *cd_spectrum_planckian_new (gdouble temperature); +CdSpectrum *cd_spectrum_planckian_new_full (gdouble temperature, + gdouble start, + gdouble end, + gdouble resolution); void cd_spectrum_free (CdSpectrum *spectrum); CdSpectrum *cd_spectrum_dup (const CdSpectrum *spectrum); +void cd_spectrum_limit_min (CdSpectrum *spectrum, + gdouble value); +void cd_spectrum_limit_max (CdSpectrum *spectrum, + gdouble value); void cd_spectrum_normalize (CdSpectrum *spectrum, gdouble wavelength, gdouble value); void cd_spectrum_normalize_max (CdSpectrum *spectrum, gdouble value); +CdSpectrum *cd_spectrum_subtract (CdSpectrum *s1, + CdSpectrum *s2, + gdouble resolution); +gchar *cd_spectrum_to_string (CdSpectrum *spectrum, + guint max_width, + guint max_height); const gchar *cd_spectrum_get_id (const CdSpectrum *spectrum); GArray *cd_spectrum_get_data (const CdSpectrum *spectrum); @@ -53,6 +67,8 @@ gdouble cd_spectrum_get_norm (const CdSpectrum *spectrum); gdouble cd_spectrum_get_resolution (const CdSpectrum *spectrum); guint cd_spectrum_get_size (const CdSpectrum *spectrum); +gdouble cd_spectrum_get_value_max (const CdSpectrum *spectrum); +gdouble cd_spectrum_get_value_min (const CdSpectrum *spectrum); gdouble cd_spectrum_get_value (const CdSpectrum *spectrum, guint idx); gdouble cd_spectrum_get_value_raw (const CdSpectrum *spectrum, @@ -77,9 +93,23 @@ gdouble data); void cd_spectrum_add_value (CdSpectrum *spectrum, gdouble data); +void cd_spectrum_set_wavelength_cal (CdSpectrum *spectrum, + gdouble c1, + gdouble c2, + gdouble c3); +void cd_spectrum_get_wavelength_cal (CdSpectrum *spectrum, + gdouble *c1, + gdouble *c2, + gdouble *c3); CdSpectrum *cd_spectrum_multiply (CdSpectrum *s1, CdSpectrum *s2, gdouble resolution); +CdSpectrum *cd_spectrum_resample (CdSpectrum *spectrum, + gdouble start, + gdouble end, + gdouble resolution); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(CdSpectrum, cd_spectrum_free) G_END_DECLS diff -Nru colord-1.2.12/lib/colord/cd-test-daemon.c colord-1.3.2/lib/colord/cd-test-daemon.c --- colord-1.2.12/lib/colord/cd-test-daemon.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-test-daemon.c 2015-10-14 17:09:55.000000000 +0000 @@ -27,7 +27,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-client.h" #include "cd-client-sync.h" #include "cd-device.h" @@ -47,7 +46,7 @@ gpointer user_data) { CdClient *client = CD_CLIENT (object); - GError *error = NULL; + g_autoptr(GError) error = NULL; GPtrArray *devices; /* get the result */ @@ -83,7 +82,7 @@ gchar *profile2_path; gchar *profile_id; gchar *profile_path; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; GHashTable *profile_props; GPtrArray *array; @@ -223,7 +222,7 @@ NULL, &error); g_assert_error (error, CD_DEVICE_ERROR, CD_DEVICE_ERROR_PROFILE_DOES_NOT_EXIST); - g_assert (relation == CD_DEVICE_RELATION_UNKNOWN); + g_assert_cmpint (relation, ==, CD_DEVICE_RELATION_UNKNOWN); g_clear_error (&error); /* assign profile to device */ @@ -370,7 +369,7 @@ gchar *basename; gchar *filename; gchar *profile_id; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *profile_props; guint32 key; struct tm profile_created_time = @@ -499,7 +498,7 @@ gboolean ret; gchar *device_id; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; GHashTable *profile_props; @@ -662,7 +661,7 @@ CdProfile *profile_on_device; gboolean ret; gchar *device_id; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; GHashTable *profile_props; @@ -794,7 +793,7 @@ CdProfile *profile_on_device; gboolean ret; gchar *device_id; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; GHashTable *profile_props; @@ -894,7 +893,7 @@ { gchar *filename; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *metadata; GHashTable *profile_props; CdProfile *profile; @@ -967,7 +966,7 @@ gpointer user_data) { CdSensor *sensor = CD_SENSOR (object); - GError *error = NULL; + g_autoptr(GError) error = NULL; gboolean ret; /* get the result */ @@ -997,7 +996,7 @@ CdColorXYZ *values; CdSensor *sensor; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *hash; GPtrArray *array; @@ -1153,7 +1152,7 @@ CdClient *client; const gchar *version; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; /* no running colord to use */ client = cd_client_new (); @@ -1196,7 +1195,7 @@ gboolean ret; gchar *profile_id1; gchar *profile_id2; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; gint32 key; @@ -1392,7 +1391,7 @@ CdProfile *profile; GHashTable *profile_props; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; gchar *filename; /* no running colord to use */ @@ -1464,7 +1463,7 @@ GFile *file; GFile *invalid_file; GFile *dest; - GError *error = NULL; + g_autoptr(GError) error = NULL; gchar *dest_path; gchar *filename; @@ -1556,7 +1555,7 @@ colord_delete_profile_good_cb (GObject *object, GAsyncResult *res, gpointer user_data) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; CdClient *client = CD_CLIENT (object); ret = cd_client_delete_profile_finish (client, res, &error); @@ -1570,7 +1569,7 @@ colord_delete_profile_bad_cb (GObject *object, GAsyncResult *res, gpointer user_data) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; CdClient *client = CD_CLIENT (object); ret = cd_client_delete_profile_finish (client, res, &error); @@ -1584,7 +1583,7 @@ colord_client_async_func (void) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; CdClient *client; CdProfile *profile; @@ -1633,7 +1632,7 @@ colord_device_connect_cb (GObject *object, GAsyncResult *res, gpointer user_data) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; CdDevice *device = CD_DEVICE (object); ret = cd_device_connect_finish (device, res, &error); @@ -1649,12 +1648,12 @@ CdDevice *device; CdDevice *device_tmp; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; const gchar *device_name = "device_async_dave"; struct passwd *user_details; - _cleanup_free_ gchar *device_path = NULL; - _cleanup_object_unref_ CdClient *client = NULL; + g_autofree gchar *device_path = NULL; + g_autoptr(CdClient) client = NULL; /* no running colord to use */ if (!has_colord_process) { @@ -1735,7 +1734,7 @@ CdProfile *profile; GHashTable *profile_props; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; gchar *filename; /* no running colord to use */ @@ -1793,7 +1792,7 @@ { CdDevice *device; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; /* no running colord to use */ if (!has_colord_process) { @@ -1822,7 +1821,7 @@ gboolean ret; gchar *device_id; gchar *device_path; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; GPtrArray *array; GPtrArray *devices; @@ -1978,7 +1977,7 @@ CdClient *client; CdDevice *device; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; /* no running colord to use */ @@ -2029,7 +2028,7 @@ CdClient *client; CdDevice *device; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; /* no running colord to use */ @@ -2057,7 +2056,6 @@ &error); g_assert_error (error, CD_CLIENT_ERROR, CD_CLIENT_ERROR_INPUT_INVALID); g_assert (device == NULL); - g_error_free (error); g_hash_table_unref (device_props); g_object_unref (client); @@ -2069,7 +2067,7 @@ CdClient *client; CdProfile *profile; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; /* no running colord to use */ if (!has_colord_process) { @@ -2109,7 +2107,7 @@ CdDevice *device; CdProfile *profile; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; GHashTable *profile_props; GPtrArray *array; @@ -2122,7 +2120,9 @@ /* create */ client = cd_client_new (); - g_assert (client != NULL); + ret = cd_client_connect_sync (client, NULL, &error); + g_assert_no_error (error); + g_assert (ret); /* create device */ device_props = g_hash_table_new_full (g_str_hash, g_str_equal, @@ -2225,7 +2225,7 @@ const gchar *tmp; #endif gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; /* no running colord to use */ @@ -2284,7 +2284,7 @@ CdClient *client; CdDevice *device; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; /* no running colord to use */ @@ -2393,7 +2393,7 @@ CdProfile *profile_tmp; gboolean ret; gchar *device_id; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *device_props; GPtrArray *array; @@ -2405,7 +2405,9 @@ /* create */ client = cd_client_new (); - g_assert (client != NULL); + ret = cd_client_connect_sync (client, NULL, &error); + g_assert_no_error (error); + g_assert (ret); /* create device */ device_id = colord_get_random_device_id (); @@ -2578,7 +2580,7 @@ CdProfile *profile2; gboolean ret; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *profile_props; /* no running colord to use */ @@ -2589,7 +2591,9 @@ /* create */ client = cd_client_new (); - g_assert (client != NULL); + ret = cd_client_connect_sync (client, NULL, &error); + g_assert_no_error (error); + g_assert (ret); /* create extra profile */ filename = cd_test_get_filename ("ibm-t61.icc"); @@ -2643,7 +2647,8 @@ CdDevice *device1; CdDevice *device2; gchar *device_id; - GError *error = NULL; + gboolean ret; + g_autoptr(GError) error = NULL; GHashTable *device_props; /* no running colord to use */ @@ -2654,7 +2659,9 @@ /* create */ client = cd_client_new (); - g_assert (client != NULL); + ret = cd_client_connect_sync (client, NULL, &error); + g_assert_no_error (error); + g_assert (ret); /* create device */ device_id = colord_get_random_device_id (); diff -Nru colord-1.2.12/lib/colord/cd-test-private.c colord-1.3.2/lib/colord/cd-test-private.c --- colord-1.2.12/lib/colord/cd-test-private.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-test-private.c 2015-10-26 15:53:31.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2010-2013 Richard Hughes + * Copyright (C) 2010-2015 Richard Hughes * * Licensed under the GNU Lesser General Public License Version 2.1 * @@ -48,7 +48,6 @@ #include "cd-transform.h" #include "cd-version.h" -#include "cd-cleanup.h" #include "cd-test-shared.h" static void @@ -58,7 +57,7 @@ CdIt8 *tcs; CdIt8 *test; CdSpectrum *f4; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; gboolean ret; gdouble value = 0.f; @@ -111,15 +110,15 @@ colord_it8_spectra_util_func (void) { CdColorXYZ value; - CdIt8 *cmf; - CdIt8 *spectra; CdSpectrum *data; - CdSpectrum *unity; - GError *error = NULL; GFile *file; - GPtrArray *array; gboolean ret; gchar *filename; + g_autoptr(CdIt8) cmf = NULL; + g_autoptr(CdIt8) spectra = NULL; + g_autoptr(CdSpectrum) unity = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GPtrArray) array = NULL; /* load a CMF */ cmf = cd_it8_new (); @@ -157,17 +156,12 @@ g_assert_cmpfloat (value.Y, <, 1.f + 0.01); g_assert_cmpfloat (value.Z, >, 0.813050f - 0.01); g_assert_cmpfloat (value.Z, <, 0.813050f + 0.01); - g_ptr_array_unref (array); - - cd_spectrum_free (unity); - g_object_unref (cmf); - g_object_unref (spectra); } static void colord_spectrum_planckian_func (void) { - CdSpectrum *s; + g_autoptr(CdSpectrum) s = NULL; guint i; s = cd_spectrum_planckian_new (2940); @@ -182,14 +176,72 @@ g_assert_cmpfloat (cd_spectrum_get_value (s, i), >, 1.f); g_assert_cmpfloat (cd_spectrum_get_value (s, i), <, 241.f); } +} - cd_spectrum_free (s); +static void +colord_spectrum_subtract_func (void) +{ + g_autoptr(CdSpectrum) s = NULL; + g_autoptr(CdSpectrum) s1 = NULL; + g_autoptr(CdSpectrum) s2 = NULL; + g_autoptr(CdSpectrum) s3 = NULL; + g_autoptr(CdSpectrum) s4 = NULL; + + /* source data */ + s1 = cd_spectrum_new (); + cd_spectrum_set_id (s1, "Source"); + cd_spectrum_set_start (s1, 360); + cd_spectrum_set_end (s1, 780); + cd_spectrum_add_value (s1, 11); + cd_spectrum_add_value (s1, 12); + cd_spectrum_add_value (s1, 13); + cd_spectrum_add_value (s1, 14); + + /* background */ + s2 = cd_spectrum_new (); + cd_spectrum_set_id (s2, "DarkCalibration"); + cd_spectrum_set_start (s2, 360); + cd_spectrum_set_end (s2, 780); + cd_spectrum_add_value (s2, 10); + cd_spectrum_add_value (s2, 10); + cd_spectrum_add_value (s2, 10); + cd_spectrum_add_value (s2, 15); + + /* subtract */ + s = cd_spectrum_subtract (s1, s2, 5); + g_assert_cmpstr (cd_spectrum_get_id (s), ==, "Source-DarkCalibration"); + g_assert_cmpint (cd_spectrum_get_size (s), ==, 4); + g_assert_cmpint (cd_spectrum_get_value_raw (s, 0), ==, 1); + g_assert_cmpint (cd_spectrum_get_value_raw (s, 1), ==, 2); + g_assert_cmpint (cd_spectrum_get_value_raw (s, 2), ==, 3); + g_assert_cmpint (cd_spectrum_get_value_raw (s, 3), ==, -1); + + /* limit this */ + cd_spectrum_limit_min (s, 0.f); + cd_spectrum_limit_max (s, 2.f); + g_assert_cmpint (cd_spectrum_get_value_raw (s, 0), ==, 1); + g_assert_cmpint (cd_spectrum_get_value_raw (s, 1), ==, 2); + g_assert_cmpint (cd_spectrum_get_value_raw (s, 2), ==, 2); + g_assert_cmpint (cd_spectrum_get_value_raw (s, 3), ==, 0); + + /* require resampling */ + s3 = cd_spectrum_new (); + cd_spectrum_set_id (s3, "DC"); + cd_spectrum_set_start (s3, 360); + cd_spectrum_set_end (s3, 780); + cd_spectrum_add_value (s3, 10); + s4 = cd_spectrum_subtract (s1, s3, 84); + g_assert_cmpstr (cd_spectrum_get_id (s4), ==, "Source-DC"); + g_assert_cmpint (cd_spectrum_get_size (s4), ==, 6); + g_assert_cmpint (cd_spectrum_get_value_raw (s4, 0), ==, 1); + g_assert_cmpint (cd_spectrum_get_value_raw (s4, 5), ==, 4); } static void colord_spectrum_func (void) { - CdSpectrum *s; + g_autoptr(CdSpectrum) s = NULL; + g_autofree gchar *txt = NULL; gdouble val; s = cd_spectrum_new (); @@ -207,6 +259,12 @@ cd_spectrum_add_value (s, 0.75f); cd_spectrum_add_value (s, 1.00f); + /* check printable */ + txt = cd_spectrum_to_string (s, 100, 15); + g_print ("\n%s\n", txt); + + g_assert_cmpfloat (ABS (cd_spectrum_get_value_max (s) - 1.f), <, 0.0001f); + g_assert_cmpfloat (ABS (cd_spectrum_get_value_min (s) - 0.5f), <, 0.0001f); g_assert_cmpfloat (ABS (cd_spectrum_get_start (s) - 100.f), <, 0.0001f); g_assert_cmpfloat (ABS (cd_spectrum_get_end (s) - 300.f), <, 0.0001f); g_assert_cmpfloat (ABS (cd_spectrum_get_value (s, 0) - 0.50f), <, 0.0001f); @@ -254,8 +312,61 @@ /* test setting of data */ cd_spectrum_set_value (s, 0, 10.f); g_assert_cmpfloat (ABS (cd_spectrum_get_value (s, 0) - 10.0f), <, 0.001f); +} + +static void +colord_spect_cx_func (void) +{ + gdouble tmp; + g_autoptr(CdSpectrum) sp = NULL; + g_autoptr(CdSpectrum) sp_resampled = NULL; - cd_spectrum_free (s); + /* create test spectrum */ + sp = cd_spectrum_new (); + cd_spectrum_set_start (sp, 100); + cd_spectrum_set_end (sp, 200); + g_assert_cmpfloat (fabs (cd_spectrum_get_end (sp) - 200.f), <, 0.001); + + /* we don't calculate the coefficients with no data */ + cd_spectrum_get_wavelength_cal (sp, &tmp, NULL, NULL); + g_assert_cmpfloat (fabs (tmp - -1.f), <, 0.001); + + /* try again, this time with data added first */ + cd_spectrum_add_value (sp, 1.f); + cd_spectrum_add_value (sp, 2.f); + cd_spectrum_add_value (sp, 3.f); + cd_spectrum_set_end (sp, 200); + cd_spectrum_get_wavelength_cal (sp, &tmp, NULL, NULL); + g_assert_cmpfloat (fabs (tmp - 50.f), <, 0.001); + + /* test with linear polynomials */ + g_assert_cmpfloat (fabs (cd_spectrum_get_end (sp) - 200.f), <, 0.001); + tmp = cd_spectrum_get_wavelength (sp, 0); + g_assert_cmpfloat (fabs (tmp - 100), <, 0.001); + tmp = cd_spectrum_get_wavelength (sp, 1); + g_assert_cmpfloat (fabs (tmp - 150), <, 0.001); + tmp = cd_spectrum_get_wavelength (sp, 2); + g_assert_cmpfloat (fabs (tmp - 200), <, 0.001); + + /* test with 3rd order polynomials */ + cd_spectrum_set_wavelength_cal (sp, 100.1f, 1.1f, 0.1f); + g_assert_cmpfloat (fabs (cd_spectrum_get_end (sp) - 305.3999f), <, 0.01); + tmp = cd_spectrum_get_wavelength (sp, 0); + g_assert_cmpfloat (fabs (tmp - 100), <, 0.001); + tmp = cd_spectrum_get_wavelength (sp, 1); + g_assert_cmpfloat (fabs (tmp - 201.2999), <, 0.01); + tmp = cd_spectrum_get_wavelength (sp, 2); + g_assert_cmpfloat (fabs (tmp - 305.3999), <, 0.01); + + /* resample to linear data space */ + cd_spectrum_set_wavelength_cal (sp, 50.1f, 50.1f, 0.0f); + sp_resampled = cd_spectrum_resample (sp, 100, 300, 100); + tmp = cd_spectrum_get_value_for_nm (sp_resampled, 100.f); + g_assert_cmpfloat (fabs (tmp - 1.f), <, 0.001); + tmp = cd_spectrum_get_value_for_nm (sp_resampled, 200.f); + g_assert_cmpfloat (fabs (tmp - 1.998f), <, 0.001); + tmp = cd_spectrum_get_value_for_nm (sp_resampled, 300.f); + g_assert_cmpfloat (fabs (tmp - 2.498f), <, 0.001); } static void @@ -263,7 +374,7 @@ { CdIt8 *it8; CdSpectrum *spectrum; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; GPtrArray *spectral_data; gboolean ret; @@ -291,11 +402,57 @@ g_assert_cmpfloat (ABS (cd_spectrum_get_value (spectrum, 1) - 1.00f), <, 0.01f); g_ptr_array_unref (spectral_data); - /* save to file */ + /* normalize this */ + cd_spectrum_set_norm (spectrum, 100); + + /* save to non-normalised file */ + cd_it8_set_normalized (it8, FALSE); + cd_it8_set_enable_created (it8, FALSE); ret = cd_it8_save_to_data (it8, &data, NULL, &error); g_assert_no_error (error); g_assert (ret); g_assert (data != NULL); + ret = cd_test_compare_lines (data, + "SPECT \n" + "DESCRIPTOR \"Spectral Power\"\n" + "SPECTRAL_START_NM 350.0\n" + "SPECTRAL_END_NM 740.0\n" + "SPECTRAL_BANDS 2\n" + "NUMBER_OF_FIELDS 2\n" + "NUMBER_OF_SETS 1\n" + "BEGIN_DATA_FORMAT\n" + " SPEC_350 SPEC_740\n" + "END_DATA_FORMAT\n" + "BEGIN_DATA\n" + " 1.0 100.0\n" + "END_DATA\n", &error); + g_assert_no_error (error); + g_assert (ret); + g_free (data); + + /* save to normalised file */ + cd_it8_set_normalized (it8, TRUE); + ret = cd_it8_save_to_data (it8, &data, NULL, &error); + g_assert_no_error (error); + g_assert (ret); + g_assert (data != NULL); + ret = cd_test_compare_lines (data, + "SPECT \n" + "DESCRIPTOR \"Spectral Power\"\n" + "SPECTRAL_START_NM 350.0\n" + "SPECTRAL_END_NM 740.0\n" + "SPECTRAL_BANDS 2\n" + "NUMBER_OF_FIELDS 2\n" + "SPECTRAL_NORM 100.0\n" + "NUMBER_OF_SETS 1\n" + "BEGIN_DATA_FORMAT\n" + " SPEC_350 SPEC_740\n" + "END_DATA_FORMAT\n" + "BEGIN_DATA\n" + " 0.01 1.0\n" + "END_DATA\n", &error); + g_assert_no_error (error); + g_assert (ret); g_free (data); g_free (filename); @@ -308,7 +465,7 @@ { CdIt8 *it8; CdSpectrum *spectrum; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; GPtrArray *spectral_data; gboolean ret; @@ -364,7 +521,7 @@ gboolean ret; gchar *data; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; GFile *file_new; gsize data_len; @@ -434,7 +591,7 @@ const gchar *orig_locale; gboolean ret; gchar *data; - GError *error = NULL; + g_autoptr(GError) error = NULL; /* set to a locale with ',' as the decimal point */ orig_locale = setlocale (LC_NUMERIC, NULL); @@ -476,7 +633,7 @@ CdIt8 *it8; gboolean ret; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; GFile *file_new; @@ -535,7 +692,7 @@ CdIt8 *ref; gboolean ret; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; /* load reference */ @@ -576,7 +733,7 @@ const CdMat3x3 *matrix; gboolean ret; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; GFile *file_new; @@ -806,7 +963,7 @@ const GNode *tmp; gboolean ret; gchar *str; - GError *error = NULL; + g_autoptr(GError) error = NULL; dom = cd_dom_new (); @@ -856,7 +1013,7 @@ ""; const GNode *tmp; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; dom = cd_dom_new (); @@ -893,7 +1050,7 @@ const gchar *lang; const GNode *tmp; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GHashTable *hash; dom = cd_dom_new (); @@ -924,7 +1081,7 @@ colord_color_func (void) { CdColorUVW uvw; - CdColorXYZ *xyz; + g_autoptr(CdColorXYZ) xyz = NULL; CdColorXYZ xyz_src; CdColorYxy yxy; @@ -954,8 +1111,6 @@ g_assert_cmpfloat (ABS (xyz->X - 2.0), <, 0.01); g_assert_cmpfloat (ABS (xyz->Y - 1.0), <, 0.01); g_assert_cmpfloat (ABS (xyz->Z - 0.5), <, 0.01); - - cd_color_xyz_free (xyz); } @@ -1063,7 +1218,7 @@ gdouble tmp; gdouble x; gdouble y; - GError *error = NULL; + g_autoptr(GError) error = NULL; guint i; guint new_length = 10; const gdouble data[] = { 0.100000, 0.211111, 0.322222, 0.366667, @@ -1119,7 +1274,7 @@ gboolean ret; gdouble x; gdouble y; - GError *error = NULL; + g_autoptr(GError) error = NULL; guint i; guint new_length = 10; const gdouble data[] = { 0.100000, 0.232810, 0.329704, 0.372559, @@ -1178,7 +1333,7 @@ colord_icc_clear_func (void) { CdIcc *icc; - GError *error = NULL; + g_autoptr(GError) error = NULL; gboolean ret; GBytes *payload; const gchar *tmp; @@ -1225,7 +1380,6 @@ tmp = cd_icc_get_model (icc, NULL, &error); g_assert_error (error, CD_ICC_ERROR, CD_ICC_ERROR_NO_DATA); g_assert (tmp == NULL); - g_error_free (error); g_bytes_unref (payload); g_object_unref (icc); @@ -1244,7 +1398,7 @@ gchar *filename; gchar *tmp; GDateTime *created; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; GHashTable *metadata; gpointer handle; @@ -1369,7 +1523,7 @@ CdColorYxy white; CdIcc *icc; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; /* create a profile from the EDID data */ icc = cd_icc_new (); @@ -1394,7 +1548,7 @@ gchar *md5; gboolean ret; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; /* load source file */ @@ -1424,7 +1578,7 @@ colord_icc_empty_func (void) { CdIcc *icc; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; gboolean ret; gchar *filename; @@ -1440,7 +1594,6 @@ &error); g_assert_error (error, CD_ICC_ERROR, CD_ICC_ERROR_FAILED_TO_PARSE); g_assert (!ret); - g_error_free (error); g_free (filename); g_object_unref (file); g_object_unref (icc); @@ -1450,7 +1603,7 @@ colord_icc_corrupt_dict_func (void) { CdIcc *icc; - GError *error = NULL; + g_autoptr(GError) error = NULL; gboolean ret; gchar *filename; int fd; @@ -1483,7 +1636,7 @@ const gchar *str; gboolean ret; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; /* load source file */ @@ -1557,7 +1710,7 @@ gboolean ret; gchar *filename; gchar *tmp; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; /* open a localized profile */ @@ -1633,7 +1786,7 @@ const guint width = 1920; gboolean ret; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; GTimer *timer; guint8 data_in[3] = { 127, 32, 64 }; @@ -1755,7 +1908,7 @@ { gboolean ret; gchar *data; - GError *error = NULL; + g_autoptr(GError) error = NULL; gsize len; ret = g_file_get_contents (src, &data, &len, &error); @@ -1796,7 +1949,7 @@ gchar *filename2; gchar *newroot; gchar *root; - GError *error = NULL; + g_autoptr(GError) error = NULL; GPtrArray *array; guint added = 0; guint removed = 0; @@ -1921,7 +2074,7 @@ CdIcc *icc_reference; gboolean ret; gdouble coverage = 0; - GError *error = NULL; + g_autoptr(GError) error = NULL; icc_reference = cd_icc_new (); ret = cd_icc_create_default (icc_reference, &error); @@ -1955,7 +2108,7 @@ GBytes *data_edid; gchar *data; gchar *filename; - GError *error = NULL; + g_autoptr(GError) error = NULL; gsize length = 0; edid = cd_edid_new (); @@ -2042,7 +2195,7 @@ colord_icc_tags_func (void) { CdIcc *icc; - GError *error = NULL; + g_autoptr(GError) error = NULL; GFile *file; gboolean ret; gchar **tags; @@ -2108,12 +2261,12 @@ CdColorRGB rgb; CdColorXYZ xyz; CdColorXYZ *tmp; - GError *error = NULL; + g_autoptr(GError) error = NULL; cmsToneCurve *curve; gboolean ret; gdouble gamma_est; guint i; - _cleanup_object_unref_ CdIt8 *it8 = NULL; + g_autoptr(CdIt8) it8 = NULL; /* add some dummy primary data */ it8 = cd_it8_new_with_kind (CD_IT8_KIND_TI3); @@ -2164,6 +2317,8 @@ /* tests go here */ g_test_add_func ("/colord/spectrum", colord_spectrum_func); g_test_add_func ("/colord/spectrum{planckian}", colord_spectrum_planckian_func); + g_test_add_func ("/colord/spectrum{subtract}", colord_spectrum_subtract_func); + g_test_add_func ("/colord/spectrum{cx}", colord_spect_cx_func); g_test_add_func ("/colord/edid", colord_edid_func); g_test_add_func ("/colord/transform", colord_transform_func); g_test_add_func ("/colord/icc", colord_icc_func); diff -Nru colord-1.2.12/lib/colord/cd-test-shared.c colord-1.3.2/lib/colord/cd-test-shared.c --- colord-1.2.12/lib/colord/cd-test-shared.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-test-shared.c 2015-10-16 11:04:50.000000000 +0000 @@ -26,7 +26,6 @@ #include -#include "cd-cleanup.h" #include "cd-test-shared.h" /** @@ -37,7 +36,7 @@ { gchar *tmp; char full_tmp[PATH_MAX]; - _cleanup_free_ gchar *path = NULL; + g_autofree gchar *path = NULL; /* running in the installed system */ if (g_getenv ("INSTALLED_TESTS") != NULL) { @@ -94,3 +93,29 @@ _test_loop = NULL; } } + +/** + * cd_test_compare_lines: + **/ +gboolean +cd_test_compare_lines (const gchar *txt1, const gchar *txt2, GError **error) +{ + g_autofree gchar *output = NULL; + + /* exactly the same */ + if (g_strcmp0 (txt1, txt2) == 0) + return TRUE; + + /* save temp files and diff them */ + if (!g_file_set_contents ("/tmp/a", txt1, -1, error)) + return FALSE; + if (!g_file_set_contents ("/tmp/b", txt2, -1, error)) + return FALSE; + if (!g_spawn_command_line_sync ("diff -urNp /tmp/b /tmp/a", + &output, NULL, NULL, error)) + return FALSE; + + /* just output the diff */ + g_set_error_literal (error, 1, 0, output); + return FALSE; +} diff -Nru colord-1.2.12/lib/colord/cd-test-shared.h colord-1.3.2/lib/colord/cd-test-shared.h --- colord-1.2.12/lib/colord/cd-test-shared.h 2015-05-01 13:55:26.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-test-shared.h 2015-10-16 11:04:50.000000000 +0000 @@ -29,6 +29,9 @@ gchar *cd_test_get_filename (const gchar *filename); void cd_test_loop_quit (void); void cd_test_loop_run_with_timeout (guint timeout_ms); +gboolean cd_test_compare_lines (const gchar *txt1, + const gchar *txt2, + GError **error); G_END_DECLS diff -Nru colord-1.2.12/lib/colord/cd-transform.c colord-1.3.2/lib/colord/cd-transform.c --- colord-1.2.12/lib/colord/cd-transform.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-transform.c 2015-10-13 15:24:13.000000000 +0000 @@ -35,7 +35,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-context-lcms.h" #include "cd-transform.h" @@ -43,14 +42,14 @@ static void cd_transform_init (CdTransform *transform); static void cd_transform_finalize (GObject *object); -#define CD_TRANSFORM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_TRANSFORM, CdTransformPrivate)) +#define GET_PRIVATE(o) (cd_transform_get_instance_private (o)) /** * CdTransformPrivate: * * Private #CdTransform data **/ -struct _CdTransformPrivate +typedef struct { CdIcc *input_icc; CdIcc *output_icc; @@ -65,9 +64,9 @@ guint max_threads; guint bpp_input; guint bpp_output; -}; +} CdTransformPrivate; -G_DEFINE_TYPE (CdTransform, cd_transform, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdTransform, cd_transform, G_TYPE_OBJECT) enum { PROP_0, @@ -103,9 +102,10 @@ static void cd_transform_invalidate (CdTransform *transform) { - if (transform->priv->lcms_transform != NULL) - cmsDeleteTransform (transform->priv->lcms_transform); - transform->priv->lcms_transform = NULL; + CdTransformPrivate *priv = GET_PRIVATE (transform); + if (priv->lcms_transform != NULL) + cmsDeleteTransform (priv->lcms_transform); + priv->lcms_transform = NULL; } /** @@ -120,17 +120,19 @@ void cd_transform_set_input_icc (CdTransform *transform, CdIcc *icc) { + CdTransformPrivate *priv = GET_PRIVATE (transform); + g_return_if_fail (CD_IS_TRANSFORM (transform)); g_return_if_fail (icc == NULL || CD_IS_ICC (icc)); /* no change */ - if (transform->priv->input_icc == icc) + if (priv->input_icc == icc) return; - if (transform->priv->input_icc != NULL) - g_clear_object (&transform->priv->input_icc); + if (priv->input_icc != NULL) + g_clear_object (&priv->input_icc); if (icc != NULL) - transform->priv->input_icc = g_object_ref (icc); + priv->input_icc = g_object_ref (icc); cd_transform_invalidate (transform); } @@ -147,8 +149,9 @@ CdIcc * cd_transform_get_input_icc (CdTransform *transform) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_val_if_fail (CD_IS_TRANSFORM (transform), NULL); - return transform->priv->input_icc; + return priv->input_icc; } /** @@ -163,17 +166,19 @@ void cd_transform_set_output_icc (CdTransform *transform, CdIcc *icc) { + CdTransformPrivate *priv = GET_PRIVATE (transform); + g_return_if_fail (CD_IS_TRANSFORM (transform)); g_return_if_fail (icc == NULL || CD_IS_ICC (icc)); /* no change */ - if (transform->priv->output_icc == icc) + if (priv->output_icc == icc) return; - if (transform->priv->output_icc != NULL) - g_clear_object (&transform->priv->output_icc); + if (priv->output_icc != NULL) + g_clear_object (&priv->output_icc); if (icc != NULL) - transform->priv->output_icc = g_object_ref (icc); + priv->output_icc = g_object_ref (icc); cd_transform_invalidate (transform); } @@ -190,8 +195,9 @@ CdIcc * cd_transform_get_output_icc (CdTransform *transform) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_val_if_fail (CD_IS_TRANSFORM (transform), NULL); - return transform->priv->output_icc; + return priv->output_icc; } /** @@ -207,17 +213,19 @@ void cd_transform_set_abstract_icc (CdTransform *transform, CdIcc *icc) { + CdTransformPrivate *priv = GET_PRIVATE (transform); + g_return_if_fail (CD_IS_TRANSFORM (transform)); g_return_if_fail (icc == NULL || CD_IS_ICC (icc)); /* no change */ - if (transform->priv->abstract_icc == icc) + if (priv->abstract_icc == icc) return; - if (transform->priv->abstract_icc != NULL) - g_clear_object (&transform->priv->abstract_icc); + if (priv->abstract_icc != NULL) + g_clear_object (&priv->abstract_icc); if (icc != NULL) - transform->priv->abstract_icc = g_object_ref (icc); + priv->abstract_icc = g_object_ref (icc); cd_transform_invalidate (transform); } @@ -234,8 +242,9 @@ CdIcc * cd_transform_get_abstract_icc (CdTransform *transform) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_val_if_fail (CD_IS_TRANSFORM (transform), NULL); - return transform->priv->abstract_icc; + return priv->abstract_icc; } /** @@ -250,10 +259,12 @@ void cd_transform_set_input_pixel_format (CdTransform *transform, CdPixelFormat pixel_format) { + CdTransformPrivate *priv = GET_PRIVATE (transform); + g_return_if_fail (CD_IS_TRANSFORM (transform)); g_return_if_fail (pixel_format != CD_PIXEL_FORMAT_UNKNOWN); - transform->priv->input_pixel_format = pixel_format; + priv->input_pixel_format = pixel_format; cd_transform_invalidate (transform); } @@ -270,8 +281,9 @@ CdPixelFormat cd_transform_get_input_pixel_format (CdTransform *transform) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_val_if_fail (CD_IS_TRANSFORM (transform), CD_PIXEL_FORMAT_UNKNOWN); - return transform->priv->input_pixel_format; + return priv->input_pixel_format; } /** @@ -286,10 +298,12 @@ void cd_transform_set_output_pixel_format (CdTransform *transform, CdPixelFormat pixel_format) { + CdTransformPrivate *priv = GET_PRIVATE (transform); + g_return_if_fail (CD_IS_TRANSFORM (transform)); g_return_if_fail (pixel_format != CD_PIXEL_FORMAT_UNKNOWN); - transform->priv->output_pixel_format = pixel_format; + priv->output_pixel_format = pixel_format; cd_transform_invalidate (transform); } @@ -306,8 +320,9 @@ CdPixelFormat cd_transform_get_output_pixel_format (CdTransform *transform) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_val_if_fail (CD_IS_TRANSFORM (transform), CD_PIXEL_FORMAT_UNKNOWN); - return transform->priv->output_pixel_format; + return priv->output_pixel_format; } /** @@ -322,10 +337,12 @@ void cd_transform_set_rendering_intent (CdTransform *transform, CdRenderingIntent rendering_intent) { + CdTransformPrivate *priv = GET_PRIVATE (transform); + g_return_if_fail (CD_IS_TRANSFORM (transform)); g_return_if_fail (rendering_intent != CD_RENDERING_INTENT_UNKNOWN); - transform->priv->rendering_intent = rendering_intent; + priv->rendering_intent = rendering_intent; cd_transform_invalidate (transform); } @@ -342,8 +359,9 @@ CdRenderingIntent cd_transform_get_rendering_intent (CdTransform *transform) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_val_if_fail (CD_IS_TRANSFORM (transform), CD_RENDERING_INTENT_UNKNOWN); - return transform->priv->rendering_intent; + return priv->rendering_intent; } /** @@ -358,9 +376,11 @@ void cd_transform_set_bpc (CdTransform *transform, gboolean bpc) { + CdTransformPrivate *priv = GET_PRIVATE (transform); + g_return_if_fail (CD_IS_TRANSFORM (transform)); - transform->priv->bpc = bpc; + priv->bpc = bpc; cd_transform_invalidate (transform); } @@ -377,8 +397,9 @@ gboolean cd_transform_get_bpc (CdTransform *transform) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_val_if_fail (CD_IS_TRANSFORM (transform), FALSE); - return transform->priv->bpc; + return priv->bpc; } /** @@ -393,8 +414,9 @@ void cd_transform_set_max_threads (CdTransform *transform, guint max_threads) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_if_fail (CD_IS_TRANSFORM (transform)); - transform->priv->max_threads = max_threads; + priv->max_threads = max_threads; } /** @@ -410,8 +432,9 @@ guint cd_transform_get_max_threads (CdTransform *transform) { + CdTransformPrivate *priv = GET_PRIVATE (transform); g_return_val_if_fail (CD_IS_TRANSFORM (transform), FALSE); - return transform->priv->max_threads; + return priv->max_threads; } /* map lcms intent to colord type */ @@ -452,14 +475,14 @@ static gboolean cd_transform_setup (CdTransform *transform, GError **error) { - CdTransformPrivate *priv = transform->priv; + CdTransformPrivate *priv = GET_PRIVATE (transform); cmsHPROFILE profile_in; cmsHPROFILE profile_out; cmsUInt32Number lcms_flags = 0; gboolean ret = TRUE; gint lcms_intent = -1; guint i; - _cleanup_error_free_ GError *error_local = NULL; + g_autoptr(GError) error_local = NULL; /* find native rendering intent */ for (i = 0; map_rendering_intent[i].colord != CD_RENDERING_INTENT_LAST; i++) { @@ -571,10 +594,11 @@ { CdTransformJob *job = (CdTransformJob *) data; CdTransform *transform = CD_TRANSFORM (user_data); + CdTransformPrivate *priv = GET_PRIVATE (transform); guint i; for (i = 0; i < job->rows_to_process; i++) { - cmsDoTransformStride (transform->priv->lcms_transform, + cmsDoTransformStride (priv->lcms_transform, job->p_in, job->p_out, job->width, @@ -591,8 +615,9 @@ static gboolean cd_transform_set_max_threads_default (CdTransform *transform, GError **error) { + CdTransformPrivate *priv = GET_PRIVATE (transform); gchar *tmp; - _cleanup_free_ gchar *data = NULL; + g_autofree gchar *data = NULL; /* use "cpu cores" to work out best number of threads */ if (!g_file_get_contents ("/proc/cpuinfo", &data, NULL, error)) @@ -600,11 +625,11 @@ tmp = g_strstr_len (data, -1, "cpu cores\t: "); if (tmp == NULL) { /* some processors do not provide this info */ - transform->priv->max_threads = 1; + priv->max_threads = 1; return TRUE; } - transform->priv->max_threads = g_ascii_strtoull (tmp + 12, NULL, 10); - if (transform->priv->max_threads == 0) { + priv->max_threads = g_ascii_strtoull (tmp + 12, NULL, 10); + if (priv->max_threads == 0) { g_set_error_literal (error, CD_TRANSFORM_ERROR, CD_TRANSFORM_ERROR_LAST, @@ -644,7 +669,7 @@ GError **error) { CdTransformJob *job; - CdTransformPrivate *priv = transform->priv; + CdTransformPrivate *priv = GET_PRIVATE (transform); gboolean ret = TRUE; GThreadPool *pool = NULL; guint8 *p_in; @@ -679,7 +704,7 @@ } /* get the best number of threads */ - if (transform->priv->max_threads == 0) { + if (priv->max_threads == 0) { ret = cd_transform_set_max_threads_default (transform, error); if (!ret) goto out; @@ -693,7 +718,7 @@ } /* non-threaded conversion */ - if (transform->priv->max_threads == 1) { + if (priv->max_threads == 1) { p_in = data_in; p_out = data_out; for (i = 0; i < height; i++) { @@ -711,7 +736,7 @@ /* create a threadpool for each line of the image */ pool = g_thread_pool_new (cd_transform_process_func, transform, - transform->priv->max_threads, + priv->max_threads, TRUE, error); if (pool == NULL) @@ -720,7 +745,7 @@ /* do conversion */ p_in = data_in; p_out = data_out; - rows_to_process = height / transform->priv->max_threads; + rows_to_process = height / priv->max_threads; for (i = 0; i < height; i += rows_to_process) { job = g_slice_new (CdTransformJob); job->p_in = p_in; @@ -750,7 +775,7 @@ cd_transform_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { CdTransform *transform = CD_TRANSFORM (object); - CdTransformPrivate *priv = transform->priv; + CdTransformPrivate *priv = GET_PRIVATE (transform); switch (prop_id) { case PROP_INPUT_ICC: @@ -883,8 +908,6 @@ CD_TYPE_ICC, G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_ABSTRACT_ICC, pspec); - - g_type_class_add_private (klass, sizeof (CdTransformPrivate)); } /** @@ -893,13 +916,13 @@ static void cd_transform_init (CdTransform *transform) { - transform->priv = CD_TRANSFORM_GET_PRIVATE (transform); - transform->priv->context_lcms = cd_context_lcms_new (); - transform->priv->rendering_intent = CD_RENDERING_INTENT_UNKNOWN; - transform->priv->input_pixel_format = CD_PIXEL_FORMAT_UNKNOWN; - transform->priv->output_pixel_format = CD_PIXEL_FORMAT_UNKNOWN; - transform->priv->srgb = cmsCreate_sRGBProfileTHR (transform->priv->context_lcms); - transform->priv->max_threads = 1; + CdTransformPrivate *priv = GET_PRIVATE (transform); + priv->context_lcms = cd_context_lcms_new (); + priv->rendering_intent = CD_RENDERING_INTENT_UNKNOWN; + priv->input_pixel_format = CD_PIXEL_FORMAT_UNKNOWN; + priv->output_pixel_format = CD_PIXEL_FORMAT_UNKNOWN; + priv->srgb = cmsCreate_sRGBProfileTHR (priv->context_lcms); + priv->max_threads = 1; } /** @@ -909,9 +932,9 @@ cd_transform_finalize (GObject *object) { CdTransform *transform = CD_TRANSFORM (object); - CdTransformPrivate *priv = transform->priv; + CdTransformPrivate *priv = GET_PRIVATE (transform); - cmsCloseProfile (transform->priv->srgb); + cmsCloseProfile (priv->srgb); if (priv->input_icc != NULL) g_object_unref (priv->input_icc); if (priv->output_icc != NULL) diff -Nru colord-1.2.12/lib/colord/cd-transform.h colord-1.3.2/lib/colord/cd-transform.h --- colord-1.2.12/lib/colord/cd-transform.h 2015-05-01 13:55:26.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-transform.h 2015-10-13 15:24:13.000000000 +0000 @@ -34,22 +34,11 @@ G_BEGIN_DECLS -#define CD_TYPE_TRANSFORM (cd_transform_get_type ()) -#define CD_TRANSFORM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_TRANSFORM, CdTransform)) -#define CD_TRANSFORM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_TRANSFORM, CdTransformClass)) -#define CD_IS_TRANSFORM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_TRANSFORM)) -#define CD_IS_TRANSFORM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_TRANSFORM)) -#define CD_TRANSFORM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_TRANSFORM, CdTransformClass)) #define CD_TRANSFORM_ERROR (cd_transform_error_quark ()) #define CD_TRANSFORM_TYPE_ERROR (cd_transform_error_get_type ()) -typedef struct _CdTransformPrivate CdTransformPrivate; - -typedef struct -{ - GObject parent; - CdTransformPrivate *priv; -} CdTransform; +#define CD_TYPE_TRANSFORM (cd_transform_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdTransform, cd_transform, CD, TRANSFORM, GObject) /** * CdTransformError: @@ -66,7 +55,7 @@ CD_TRANSFORM_ERROR_LAST } CdTransformError; -typedef struct +struct _CdTransformClass { GObjectClass parent_class; /*< private >*/ @@ -79,9 +68,8 @@ void (*_cd_transform_reserved6) (void); void (*_cd_transform_reserved7) (void); void (*_cd_transform_reserved8) (void); -} CdTransformClass; +}; -GType cd_transform_get_type (void); GQuark cd_transform_error_quark (void); CdTransform *cd_transform_new (void); diff -Nru colord-1.2.12/lib/colord/cd-version.h colord-1.3.2/lib/colord/cd-version.h --- colord-1.2.12/lib/colord/cd-version.h 2015-07-20 09:49:03.000000000 +0000 +++ colord-1.3.2/lib/colord/cd-version.h 2016-02-17 13:32:58.000000000 +0000 @@ -48,14 +48,14 @@ * * The compile-time minor version */ -#define CD_MINOR_VERSION (2) +#define CD_MINOR_VERSION (3) /** * CD_MICRO_VERSION: * * The compile-time micro version */ -#define CD_MICRO_VERSION (12) +#define CD_MICRO_VERSION (2) /** * CD_CHECK_VERSION: diff -Nru colord-1.2.12/lib/colord/colord-private.h colord-1.3.2/lib/colord/colord-private.h --- colord-1.2.12/lib/colord/colord-private.h 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/colord-private.h 2015-10-13 15:24:13.000000000 +0000 @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include diff -Nru colord-1.2.12/lib/colord/colord.vapi colord-1.3.2/lib/colord/colord.vapi --- colord-1.2.12/lib/colord/colord.vapi 2015-08-19 14:18:18.000000000 +0000 +++ colord-1.3.2/lib/colord/colord.vapi 2016-03-15 16:00:50.000000000 +0000 @@ -5,64 +5,123 @@ [CCode (cheader_filename = "colord.h", type_id = "cd_client_get_type ()")] public class Client : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "0.1.0")] public Client (); + [Version (since = "0.1.6")] public async bool connect (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.0")] public bool connect_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async Cd.Device create_device (string id, Cd.ObjectScope scope, GLib.HashTable? properties, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.2")] public Cd.Device create_device_sync (string id, Cd.ObjectScope scope, GLib.HashTable? properties, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async Cd.Profile create_profile (string id, Cd.ObjectScope scope, GLib.HashTable? properties, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "1.1.1")] public async Cd.Profile create_profile_for_icc (Cd.Icc icc, Cd.ObjectScope scope, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "1.1.1")] public Cd.Profile create_profile_for_icc_sync (Cd.Icc icc, Cd.ObjectScope scope, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.2")] public Cd.Profile create_profile_sync (string id, Cd.ObjectScope scope, GLib.HashTable? properties, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async bool delete_device (Cd.Device device, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool delete_device_sync (Cd.Device device, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async bool delete_profile (Cd.Profile profile, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool delete_profile_sync (Cd.Profile profile, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.26")] public static Cd.ClientError error_from_string (string error_desc); + [Version (since = "0.1.0")] public static GLib.Quark error_quark (); + [Version (since = "0.1.26")] public static unowned string error_to_string (Cd.ClientError error_enum); + [Version (since = "0.1.8")] public async Cd.Device find_device (string id, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public async Cd.Device find_device_by_property (string key, string value, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public Cd.Device find_device_by_property_sync (string key, string value, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.0")] public Cd.Device find_device_sync (string id, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async Cd.Profile find_profile (string id, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public async Cd.Profile find_profile_by_filename (string filename, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.3")] public Cd.Profile find_profile_by_filename_sync (string filename, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.24")] public async Cd.Profile find_profile_by_property (string key, string value, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.24")] public Cd.Profile find_profile_by_property_sync (string key, string value, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.0")] public Cd.Profile find_profile_sync (string id, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.26")] public async Cd.Sensor find_sensor (string id, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.26")] public Cd.Sensor find_sensor_sync (string id, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.9")] public bool get_connected (); + [Version (since = "0.1.0")] public unowned string get_daemon_version (); + [Version (since = "0.1.8")] public async GLib.GenericArray get_devices (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public async GLib.GenericArray get_devices_by_kind (Cd.DeviceKind kind, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.0")] public GLib.GenericArray get_devices_by_kind_sync (Cd.DeviceKind kind, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.0")] public GLib.GenericArray get_devices_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.12")] public bool get_has_server (); + [Version (since = "0.1.8")] public async GLib.GenericArray get_profiles (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.0")] public GLib.GenericArray get_profiles_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async GLib.GenericArray get_sensors (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.0")] public GLib.GenericArray get_sensors_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async Cd.Profile get_standard_space (Cd.StandardSpace standard_space, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.2")] public Cd.Profile get_standard_space_sync (Cd.StandardSpace standard_space, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "1.0.2")] public unowned string get_system_model (); + [Version (since = "1.0.2")] public unowned string get_system_vendor (); + [Version (since = "0.1.12")] public async Cd.Profile import_profile (GLib.File file, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.12")] public Cd.Profile import_profile_sync (GLib.File file, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.9")] public string connected { get; } + [Version (since = "0.1.0")] public string daemon_version { get; } + [Version (since = "1.0.2")] public string system_model { get; } + [Version (since = "1.0.2")] public string system_vendor { get; } + [Version (since = "0.1.0")] public virtual signal void changed (); + [Version (since = "0.1.0")] public virtual signal void device_added (Cd.Device device); + [Version (since = "0.1.2")] public virtual signal void device_changed (Cd.Device device); + [Version (since = "0.1.0")] public virtual signal void device_removed (Cd.Device device); + [Version (since = "0.1.2")] public virtual signal void profile_added (Cd.Profile profile); + [Version (since = "0.1.2")] public virtual signal void profile_changed (Cd.Profile profile); + [Version (since = "0.1.2")] public virtual signal void profile_removed (Cd.Profile profile); + [Version (since = "0.1.6")] public virtual signal void sensor_added (Cd.Sensor sensor); + [Version (since = "0.1.6")] public virtual signal void sensor_changed (Cd.Sensor sensor); + [Version (since = "0.1.6")] public virtual signal void sensor_removed (Cd.Sensor sensor); } [CCode (cheader_filename = "colord.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cd_color_lab_get_type ()")] @@ -72,11 +131,17 @@ public double a; public double b; [CCode (has_construct_function = false)] + [Version (since = "0.1.32")] public ColorLab (); + [Version (since = "0.1.32")] public void copy (Cd.ColorLab dest); + [Version (since = "0.1.32")] public double delta_e76 (Cd.ColorLab p2); + [Version (since = "0.1.32")] public Cd.ColorLab dup (); + [Version (since = "0.1.32")] public void free (); + [Version (since = "0.1.32")] public void @set (double L, double a, double b); } [CCode (cheader_filename = "colord.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cd_color_rgb_get_type ()")] @@ -86,27 +151,44 @@ public double G; public double R; [CCode (has_construct_function = false)] + [Version (since = "0.1.0")] public ColorRGB (); + [Version (since = "0.1.31")] public static GLib.GenericArray array_interpolate (GLib.GenericArray array, uint new_length); + [Version (since = "0.1.31")] public static bool array_is_monotonic (GLib.GenericArray array); + [Version (since = "0.1.31")] public static GLib.GenericArray array_new (); + [Version (since = "0.1.27")] public void copy (Cd.ColorRGB dest); + [Version (since = "0.1.27")] public Cd.ColorRGB dup (); + [Version (since = "0.1.0")] public void free (); + [Version (since = "0.1.26")] public void interpolate (Cd.ColorRGB p2, double index, Cd.ColorRGB result); + [Version (since = "0.1.27")] public void @set (double R, double G, double B); + [Version (since = "0.1.27")] public void to_rgb8 (Cd.ColorRGB8 dest); } [CCode (cheader_filename = "colord.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cd_color_swatch_get_type ()")] [Compact] public class ColorSwatch { [CCode (has_construct_function = false)] + [Version (since = "0.1.32")] public ColorSwatch (); + [Version (since = "0.1.32")] public Cd.ColorSwatch dup (); + [Version (since = "0.1.32")] public void free (); + [Version (since = "0.1.32")] public unowned string get_name (); + [Version (since = "0.1.32")] public unowned Cd.ColorLab get_value (); + [Version (since = "0.1.32")] public void set_name (string name); + [Version (since = "0.1.32")] public void set_value (Cd.ColorLab value); } [CCode (cheader_filename = "colord.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cd_color_uvw_get_type ()")] @@ -116,12 +198,19 @@ public double V; public double W; [CCode (has_construct_function = false)] + [Version (since = "1.1.6")] public ColorUVW (); + [Version (since = "1.1.6")] public void copy (Cd.ColorUVW dest); + [Version (since = "1.1.6")] public Cd.ColorUVW dup (); + [Version (since = "1.1.6")] public void free (); + [Version (since = "1.1.6")] public double get_chroma_difference (Cd.ColorUVW p2); + [Version (since = "1.1.6")] public void @set (double U, double V, double W); + [Version (since = "1.1.6")] public void set_planckian_locus (double temp); } [CCode (cheader_filename = "colord.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cd_color_xyz_get_type ()")] @@ -131,15 +220,25 @@ public double Y; public double Z; [CCode (has_construct_function = false)] + [Version (since = "0.1.0")] public ColorXYZ (); + [Version (since = "0.1.27")] public void clear (); + [Version (since = "0.1.27")] public void copy (Cd.ColorXYZ dest); + [Version (since = "0.1.27")] public Cd.ColorXYZ dup (); + [Version (since = "0.1.0")] public void free (); + [Version (since = "1.1.6")] public void normalize (double max, Cd.ColorXYZ dest); + [Version (since = "0.1.27")] public void @set (double X, double Y, double Z); + [Version (since = "1.1.6")] public double to_cct (); + [Version (since = "1.1.6")] public void to_uvw (Cd.ColorXYZ whitepoint, Cd.ColorUVW dest); + [Version (since = "0.1.27")] public void to_yxy (Cd.ColorYxy dest); } [CCode (cheader_filename = "colord.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cd_color_yxy_get_type ()")] @@ -149,203 +248,375 @@ public double x; public double y; [CCode (has_construct_function = false)] + [Version (since = "0.1.0")] public ColorYxy (); + [Version (since = "0.1.27")] public void copy (Cd.ColorYxy dest); + [Version (since = "0.1.27")] public Cd.ColorYxy dup (); + [Version (since = "0.1.0")] public void free (); + [Version (since = "0.1.27")] public void @set (double Y, double x, double y); + [Version (since = "1.1.6")] public void to_uvw (Cd.ColorUVW dest); + [Version (since = "0.1.27")] public void to_xyz (Cd.ColorXYZ dest); } [CCode (cheader_filename = "colord.h", type_id = "cd_device_get_type ()")] public class Device : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "0.1.0")] public Device (); + [Version (since = "0.1.8")] public async bool add_profile (Cd.DeviceRelation relation, Cd.Profile profile, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.3")] public bool add_profile_sync (Cd.DeviceRelation relation, Cd.Profile profile, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async bool connect (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool connect_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public bool equal (Cd.Device device2); + [Version (since = "0.1.26")] public static Cd.DeviceError error_from_string (string error_desc); + [Version (since = "0.1.0")] public static GLib.Quark error_quark (); + [Version (since = "0.1.26")] public static unowned string error_to_string (Cd.DeviceError error_enum); + [Version (since = "0.1.1")] public Cd.Colorspace get_colorspace (); + [Version (since = "0.1.9")] public bool get_connected (); + [Version (since = "0.1.0")] public uint64 get_created (); + [Version (since = "0.1.1")] public Cd.Profile get_default_profile (); + [Version (since = "0.1.27")] public bool get_embedded (); + [Version (since = "0.1.26")] public bool get_enabled (); + [Version (since = "0.1.9")] public unowned string get_format (); + [Version (since = "0.1.0")] public unowned string get_id (); + [Version (since = "0.1.0")] public Cd.DeviceKind get_kind (); + [Version (since = "0.1.5")] public GLib.HashTable get_metadata (); + [Version (since = "0.1.5")] public unowned string get_metadata_item (string key); + [Version (since = "0.1.2")] public Cd.DeviceMode get_mode (); + [Version (since = "0.1.0")] public unowned string get_model (); + [Version (since = "0.1.1")] public uint64 get_modified (); + [Version (since = "0.1.0")] public unowned string get_object_path (); + [Version (since = "0.1.13")] public uint get_owner (); + [Version (since = "0.1.8")] public async Cd.Profile get_profile_for_qualifiers (string qualifiers, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public Cd.Profile get_profile_for_qualifiers_sync (string qualifiers, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async Cd.DeviceRelation get_profile_relation (Cd.Profile profile, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public Cd.DeviceRelation get_profile_relation_sync (Cd.Profile profile, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.0")] public GLib.GenericArray get_profiles (); [CCode (array_length = false, array_null_terminated = true)] + [Version (since = "0.1.17")] public unowned string[] get_profiling_inhibitors (); + [Version (since = "0.1.10")] public Cd.ObjectScope get_scope (); + [Version (since = "0.1.24")] public unowned string get_seat (); + [Version (since = "0.1.0")] public unowned string get_serial (); + [Version (since = "0.1.1")] public unowned string get_vendor (); + [Version (since = "0.1.0")] public static Cd.DeviceKind kind_from_string (string kind); + [Version (since = "0.1.6")] public static Cd.ProfileKind kind_to_profile_kind (Cd.DeviceKind device_kind); + [Version (since = "0.1.0")] public static unowned string kind_to_string (Cd.DeviceKind kind_enum); + [Version (since = "0.1.8")] public async bool make_profile_default (Cd.Profile profile, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool make_profile_default_sync (Cd.Profile profile, GLib.Cancellable? cancellable = null) throws GLib.Error; public static Cd.DeviceMode mode_from_string (string device_mode); public static unowned string mode_to_string (Cd.DeviceMode device_mode); + [Version (since = "0.1.8")] public async bool profiling_inhibit (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.1")] public bool profiling_inhibit_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public async bool profiling_uninhibit (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.1")] public bool profiling_uninhibit_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; public static Cd.DeviceRelation relation_from_string (string device_relation); public static unowned string relation_to_string (Cd.DeviceRelation device_relation); + [Version (since = "0.1.8")] public async bool remove_profile (Cd.Profile profile, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.2")] public bool remove_profile_sync (Cd.Profile profile, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.1")] public bool set_colorspace_sync (Cd.Colorspace colorspace, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.26")] public async bool set_enabled (bool enabled, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.26")] public bool set_enabled_sync (bool enabled, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.0")] public bool set_kind_sync (Cd.DeviceKind kind, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.2")] public bool set_mode_sync (Cd.DeviceMode mode, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.0")] public bool set_model_sync (string value, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public void set_object_path (string object_path); + [Version (since = "0.1.8")] public async bool set_property (string key, string value, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool set_property_sync (string key, string value, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.1")] public bool set_serial_sync (string value, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.1")] public bool set_vendor_sync (string value, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.0")] public string to_string (); [CCode (has_construct_function = false)] + [Version (since = "0.1.8")] public Device.with_object_path (string object_path); + [Version (since = "0.1.1")] public uint colorspace { get; } + [Version (since = "0.1.9")] public string connected { get; } + [Version (since = "0.1.0")] public uint64 created { get; } + [Version (since = "0.1.27")] public string embedded { get; } + [Version (since = "0.1.26")] public bool enabled { get; } + [Version (since = "0.1.9")] public string format { get; } + [Version (since = "0.1.0")] public string id { get; } + [Version (since = "0.1.0")] public uint kind { get; } + [Version (since = "0.1.2")] public uint mode { get; } + [Version (since = "0.1.0")] public string model { get; } + [Version (since = "0.1.1")] public uint64 modified { get; } + [Version (since = "0.1.8")] public string object_path { get; set construct; } + [Version (since = "0.1.13")] public uint owner { get; } [CCode (array_length = false, array_null_terminated = true)] public string[] profiling_inhibitors { get; } + [Version (since = "0.1.10")] public uint scope { get; } + [Version (since = "0.1.24")] public string seat { get; } + [Version (since = "0.1.1")] public string serial { get; } + [Version (since = "0.1.1")] public string vendor { get; } + [Version (since = "0.1.0")] public virtual signal void changed (); } [CCode (cheader_filename = "colord.h", type_id = "cd_dom_get_type ()")] public class Dom : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "0.1.31")] public Dom (); + [Version (since = "0.1.31")] public static GLib.Quark error_quark (); + [Version (since = "0.1.31")] public unowned GLib.Node get_node (GLib.Node root, string path); + [Version (since = "0.1.31")] public static unowned string get_node_attribute (GLib.Node node, string key); + [Version (since = "0.1.31")] public static unowned string get_node_data (GLib.Node node); + [Version (since = "0.1.32")] public static double get_node_data_as_double (GLib.Node node); + [Version (since = "0.1.32")] public static int get_node_data_as_int (GLib.Node node); + [Version (since = "0.1.31")] public static bool get_node_lab (GLib.Node node, Cd.ColorLab lab); + [Version (since = "0.1.31")] public static GLib.HashTable get_node_localized (GLib.Node node, string key); + [Version (since = "0.1.31")] public static unowned string get_node_name (GLib.Node node); + [Version (since = "0.1.31")] public static bool get_node_rgb (GLib.Node node, Cd.ColorRGB rgb); + [Version (since = "0.1.31")] public static bool get_node_yxy (GLib.Node node, Cd.ColorYxy yxy); + [Version (since = "0.1.31")] public bool parse_xml_data (string data, ssize_t data_len) throws GLib.Error; + [Version (since = "0.1.31")] public string to_string (); } [CCode (cheader_filename = "colord.h", type_id = "cd_edid_get_type ()")] public class Edid : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "1.1.2")] public Edid (); + [Version (since = "1.1.2")] public static GLib.Quark error_quark (); + [Version (since = "1.1.2")] public unowned Cd.ColorYxy get_blue (); + [Version (since = "1.1.2")] public unowned string get_checksum (); + [Version (since = "1.1.2")] public unowned string get_eisa_id (); + [Version (since = "1.1.2")] public double get_gamma (); + [Version (since = "1.1.2")] public unowned Cd.ColorYxy get_green (); + [Version (since = "1.1.2")] public uint get_height (); + [Version (since = "1.1.2")] public unowned string get_monitor_name (); + [Version (since = "1.1.2")] public unowned string get_pnp_id (); + [Version (since = "1.1.2")] public unowned Cd.ColorYxy get_red (); + [Version (since = "1.1.2")] public unowned string get_serial_number (); + [Version (since = "1.1.2")] public unowned string get_vendor_name (); + [Version (since = "1.1.2")] public unowned Cd.ColorYxy get_white (); + [Version (since = "1.1.2")] public uint get_width (); + [Version (since = "1.1.2")] public bool parse (GLib.Bytes edid_data) throws GLib.Error; + [Version (since = "1.1.2")] public void reset (); } [CCode (cheader_filename = "colord.h", type_id = "cd_icc_get_type ()")] public class Icc : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "0.1.32")] public Icc (); + [Version (since = "0.1.32")] public void add_metadata (string key, string value); + [Version (since = "1.1.2")] public bool create_default () throws GLib.Error; + [Version (since = "0.1.32")] public bool create_from_edid (double gamma_value, Cd.ColorYxy red, Cd.ColorYxy green, Cd.ColorYxy blue, Cd.ColorYxy white) throws GLib.Error; + [Version (since = "1.1.2")] public bool create_from_edid_data (Cd.Edid edid) throws GLib.Error; + [Version (since = "0.1.32")] public static GLib.Quark error_quark (); + [Version (since = "0.1.32")] public unowned Cd.ColorXYZ get_blue (); + [Version (since = "0.1.32")] public bool get_can_delete (); + [Version (since = "1.1.1")] public unowned string get_characterization_data (); + [Version (since = "0.1.32")] public unowned string get_checksum (); + [Version (since = "0.1.32")] public Cd.Colorspace get_colorspace (); + [Version (since = "1.1.7")] public void* get_context (); + [Version (since = "0.1.32")] public unowned string get_copyright (string locale) throws GLib.Error; + [Version (since = "0.1.32")] public GLib.DateTime get_created (); + [Version (since = "0.1.32")] public unowned string get_description (string locale) throws GLib.Error; + [Version (since = "0.1.32")] public unowned string get_filename (); + [Version (since = "0.1.32")] public unowned Cd.ColorXYZ get_green (); public void* get_handle (); + [Version (since = "0.1.32")] public Cd.ProfileKind get_kind (); + [Version (since = "0.1.32")] public unowned string get_manufacturer (string locale) throws GLib.Error; + [Version (since = "0.1.32")] public GLib.HashTable get_metadata (); + [Version (since = "0.1.32")] public unowned string get_metadata_item (string key); + [Version (since = "0.1.32")] public unowned string get_model (string locale) throws GLib.Error; + [Version (since = "0.1.32")] public GLib.GenericArray get_named_colors (); + [Version (since = "0.1.32")] public unowned Cd.ColorXYZ get_red (); + [Version (since = "0.1.34")] public GLib.GenericArray get_response (uint size) throws GLib.Error; + [Version (since = "0.1.32")] public uint32 get_size (); + [Version (since = "1.1.6")] public GLib.Bytes get_tag_data (string tag) throws GLib.Error; [CCode (array_length = false, array_null_terminated = true)] + [Version (since = "1.1.6")] public string[] get_tags () throws GLib.Error; + [Version (since = "0.1.32")] public uint get_temperature (); + [Version (since = "0.1.34")] public GLib.GenericArray get_vcgt (uint size) throws GLib.Error; + [Version (since = "0.1.32")] public double get_version (); + [Version (since = "0.1.34")] public GLib.Array get_warnings (); + [Version (since = "0.1.32")] public unowned Cd.ColorXYZ get_white (); + [Version (since = "0.1.32")] public bool load_data (uint8 data, size_t data_len, Cd.IccLoadFlags flags) throws GLib.Error; + [Version (since = "0.1.32")] public bool load_fd (int fd, Cd.IccLoadFlags flags) throws GLib.Error; + [Version (since = "0.1.32")] public bool load_file (GLib.File file, Cd.IccLoadFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.33")] public bool load_handle (void* handle, Cd.IccLoadFlags flags) throws GLib.Error; + [Version (since = "0.1.32")] public void remove_metadata (string key); + [Version (since = "1.0.2")] public GLib.Bytes save_data (Cd.IccSaveFlags flags) throws GLib.Error; + [Version (since = "1.1.1")] public bool save_default (Cd.IccSaveFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.32")] public bool save_file (GLib.File file, Cd.IccSaveFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "1.1.1")] public void set_characterization_data (string data); + [Version (since = "0.1.32")] public void set_colorspace (Cd.Colorspace colorspace); + [Version (since = "0.1.32")] public void set_copyright (string locale, string? value); + [Version (since = "0.1.32")] public void set_copyright_items (GLib.HashTable values); + [Version (since = "0.1.32")] public void set_description (string locale, string? value); + [Version (since = "0.1.32")] public void set_description_items (GLib.HashTable values); + [Version (since = "1.1.1")] public void set_filename (string filename); + [Version (since = "0.1.32")] public void set_kind (Cd.ProfileKind kind); + [Version (since = "0.1.32")] public void set_manufacturer (string locale, string? value); + [Version (since = "0.1.32")] public void set_manufacturer_items (GLib.HashTable values); + [Version (since = "0.1.32")] public void set_model (string locale, string? value); + [Version (since = "0.1.32")] public void set_model_items (GLib.HashTable values); + [Version (since = "1.1.6")] public bool set_tag_data (string tag, GLib.Bytes data) throws GLib.Error; + [Version (since = "0.1.34")] public bool set_vcgt (GLib.GenericArray vcgt) throws GLib.Error; + [Version (since = "0.1.32")] public void set_version (double version); + [Version (since = "0.1.32")] public string to_string (); public bool utils_get_coverage (Cd.Icc icc_reference, double coverage) throws GLib.Error; public Cd.ColorXYZ blue { get; } @@ -364,272 +635,511 @@ [CCode (cheader_filename = "colord.h", type_id = "cd_icc_store_get_type ()")] public class IccStore : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "1.0.2")] public IccStore (); + [Version (since = "1.0.2")] public Cd.Icc find_by_checksum (string checksum); + [Version (since = "1.0.2")] public Cd.Icc find_by_filename (string filename); + [Version (since = "1.0.2")] public GLib.GenericArray get_all (); + [Version (since = "1.0.2")] public Cd.IccLoadFlags get_load_flags (); + [Version (since = "1.0.2")] public bool search_kind (Cd.IccStoreSearchKind search_kind, Cd.IccStoreSearchFlags search_flags, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "1.0.2")] public bool search_location (string location, Cd.IccStoreSearchFlags search_flags, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "1.0.2")] public void set_cache (GLib.Resource cache); + [Version (since = "1.0.2")] public void set_load_flags (Cd.IccLoadFlags load_flags); + [Version (since = "1.0.2")] public virtual signal void added (Cd.Icc icc); + [Version (since = "1.0.2")] public virtual signal void removed (Cd.Icc icc); } [CCode (cheader_filename = "colord.h", type_id = "cd_interp_get_type ()")] public class Interp : GLib.Object { [CCode (has_construct_function = false)] protected Interp (); + [Version (since = "0.1.31")] public static GLib.Quark error_quark (); + [Version (since = "0.1.31")] public virtual double eval (double value) throws GLib.Error; + [Version (since = "0.1.31")] public Cd.InterpKind get_kind (); + [Version (since = "0.1.31")] public uint get_size (); + [Version (since = "0.1.31")] public unowned GLib.Array get_x (); + [Version (since = "0.1.31")] public unowned GLib.Array get_y (); + [Version (since = "0.1.31")] public void insert (double x, double y); public static unowned string kind_to_string (Cd.InterpKind kind); + [Version (since = "0.1.31")] public virtual bool prepare () throws GLib.Error; [NoAccessorMethod] + [Version (since = "0.1.20")] public uint kind { get; set; } } [CCode (cheader_filename = "colord.h", type_id = "cd_interp_akima_get_type ()")] public class InterpAkima : Cd.Interp { [CCode (has_construct_function = false, type = "CdInterp*")] + [Version (since = "0.1.31")] public InterpAkima (); } [CCode (cheader_filename = "colord.h", type_id = "cd_interp_linear_get_type ()")] public class InterpLinear : Cd.Interp { [CCode (has_construct_function = false, type = "CdInterp*")] + [Version (since = "0.1.31")] public InterpLinear (); } [CCode (cheader_filename = "colord.h", type_id = "cd_it8_get_type ()")] public class It8 : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "0.1.20")] public It8 (); + [Version (since = "0.1.20")] public void add_data (Cd.ColorRGB rgb, Cd.ColorXYZ xyz); + [Version (since = "0.1.20")] public void add_option (string option); + [Version (since = "1.1.6")] public void add_spectrum (Cd.Spectrum spectrum); + [Version (since = "0.1.0")] public static GLib.Quark error_quark (); + [Version (since = "0.1.20")] public bool get_data_item (uint idx, Cd.ColorRGB rgb, Cd.ColorXYZ xyz); + [Version (since = "0.1.20")] public uint get_data_size (); + [Version (since = "0.1.33")] public bool get_enable_created (); + [Version (since = "0.1.20")] public unowned string get_instrument (); + [Version (since = "0.1.20")] public Cd.It8Kind get_kind (); + [Version (since = "0.1.20")] public unowned Cd.Mat3x3? get_matrix (); + [Version (since = "0.1.20")] public bool get_normalized (); + [Version (since = "0.1.20")] public unowned string get_originator (); + [Version (since = "0.1.20")] public unowned string get_reference (); + [Version (since = "0.1.20")] public bool get_spectral (); + [Version (since = "1.1.6")] public GLib.GenericArray get_spectrum_array (); + [Version (since = "1.1.6")] public unowned Cd.Spectrum get_spectrum_by_id (string id); + [Version (since = "0.1.20")] public unowned string get_title (); + [Version (since = "1.2.6")] public unowned Cd.ColorXYZ get_xyz_for_rgb (double R, double G, double B, double delta); + [Version (since = "0.1.20")] public bool has_option (string option); + [Version (since = "0.1.20")] public bool load_from_data (string data, size_t size) throws GLib.Error; + [Version (since = "0.1.20")] public bool load_from_file (GLib.File file) throws GLib.Error; + [Version (since = "0.1.26")] public bool save_to_data (string data, size_t size) throws GLib.Error; + [Version (since = "0.1.20")] public bool save_to_file (GLib.File file) throws GLib.Error; + [Version (since = "0.1.33")] public void set_enable_created (bool enable_created); + [Version (since = "0.1.20")] public void set_instrument (string instrument); + [Version (since = "0.1.20")] public void set_kind (Cd.It8Kind kind); + [Version (since = "0.1.20")] public void set_matrix (Cd.Mat3x3 matrix); + [Version (since = "0.1.20")] public void set_normalized (bool normalized); + [Version (since = "0.1.20")] public void set_originator (string originator); + [Version (since = "0.1.20")] public void set_reference (string reference); + [Version (since = "0.1.20")] public void set_spectral (bool spectral); + [Version (since = "1.1.6")] public void set_spectrum_array (owned GLib.GenericArray data); + [Version (since = "0.1.20")] public void set_title (string title); public bool utils_calculate_ccmx (Cd.It8 it8_measured, Cd.It8 it8_ccmx) throws GLib.Error; public bool utils_calculate_cri_from_cmf (Cd.It8 tcs, Cd.Spectrum illuminant, double value, double resolution) throws GLib.Error; + [Version (since = "0.2.6")] public bool utils_calculate_gamma (double gamma_y) throws GLib.Error; public bool utils_calculate_xyz_from_cmf (Cd.Spectrum illuminant, Cd.Spectrum spectrum, Cd.ColorXYZ value, double resolution) throws GLib.Error; [CCode (has_construct_function = false)] + [Version (since = "0.1.20")] public It8.with_kind (Cd.It8Kind kind); + [Version (since = "0.1.20")] public string instrument { get; } + [Version (since = "0.1.20")] public uint kind { get; set; } + [Version (since = "0.1.20")] public bool normalized { get; } + [Version (since = "0.1.20")] public string originator { get; } + [Version (since = "0.1.20")] public string reference { get; } + [Version (since = "0.1.20")] public bool spectral { get; } + [Version (since = "0.1.20")] public string title { get; } } [CCode (cheader_filename = "colord.h", type_id = "cd_profile_get_type ()")] public class Profile : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "0.1.0")] public Profile (); + [Version (since = "0.1.8")] public async bool connect (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool connect_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public bool equal (Cd.Profile profile2); + [Version (since = "0.1.26")] public static Cd.ProfileError error_from_string (string error_desc); + [Version (since = "0.1.0")] public static GLib.Quark error_quark (); + [Version (since = "0.1.26")] public static unowned string error_to_string (Cd.ProfileError error_enum); + [Version (since = "0.1.8")] public int64 get_age (); + [Version (since = "0.1.2")] public Cd.Colorspace get_colorspace (); + [Version (since = "0.1.9")] public bool get_connected (); + [Version (since = "0.1.8")] public int64 get_created (); + [Version (since = "0.1.0")] public unowned string get_filename (); + [Version (since = "0.1.4")] public unowned string get_format (); + [Version (since = "0.1.2")] public bool get_has_vcgt (); + [Version (since = "0.1.0")] public unowned string get_id (); + [Version (since = "0.1.2")] public bool get_is_system_wide (); + [Version (since = "0.1.1")] public Cd.ProfileKind get_kind (); + [Version (since = "0.1.2")] public GLib.HashTable get_metadata (); + [Version (since = "0.1.5")] public unowned string get_metadata_item (string key); + [Version (since = "0.1.0")] public unowned string get_object_path (); + [Version (since = "0.1.13")] public uint get_owner (); + [Version (since = "0.1.0")] public unowned string get_qualifier (); + [Version (since = "0.1.10")] public Cd.ObjectScope get_scope (); + [Version (since = "0.1.0")] public unowned string get_title (); [CCode (array_length = false, array_null_terminated = true)] + [Version (since = "0.1.25")] public unowned string[] get_warnings (); + [Version (since = "0.1.13")] public bool has_access (); + [Version (since = "0.1.8")] public async bool install_system_wide (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool install_system_wide_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "2.91.1")] public static Cd.ProfileKind kind_from_string (string profile_kind); + [Version (since = "2.91.1")] public static unowned string kind_to_string (Cd.ProfileKind profile_kind); + [Version (since = "0.1.32")] public Cd.Icc load_icc (Cd.IccLoadFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.27")] public static Cd.ProfileQuality quality_from_string (string quality); + [Version (since = "0.1.27")] public static unowned string quality_to_string (Cd.ProfileQuality quality_enum); + [Version (since = "0.1.8")] public void set_object_path (string object_path); + [Version (since = "0.1.8")] public async bool set_property (string key, string value, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool set_property_sync (string key, string value, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.0")] public string to_string (); + [Version (since = "0.1.25")] public static Cd.ProfileWarning warning_from_string (string type); + [Version (since = "0.1.25")] public static unowned string warning_to_string (Cd.ProfileWarning kind_enum); [CCode (has_construct_function = false)] + [Version (since = "0.1.8")] public Profile.with_object_path (string object_path); + [Version (since = "0.1.2")] public string colorspace { get; } + [Version (since = "0.1.9")] public string connected { get; } + [Version (since = "0.1.8")] public int64 created { get; } + [Version (since = "0.1.0")] public string filename { get; } + [Version (since = "0.1.4")] public string format { get; } + [Version (since = "0.1.2")] public string has_vcgt { get; } + [Version (since = "0.1.0")] public string id { get; } + [Version (since = "0.1.2")] public string is_system_wide { get; } + [Version (since = "0.1.1")] public string kind { get; } + [Version (since = "0.1.8")] public string object_path { get; set construct; } + [Version (since = "0.1.13")] public uint owner { get; } + [Version (since = "0.1.0")] public string qualifier { get; } + [Version (since = "0.1.10")] public uint scope { get; } + [Version (since = "0.1.0")] public string title { get; } [CCode (array_length = false, array_null_terminated = true)] + [Version (since = "0.1.25")] public string[] warnings { get; } + [Version (since = "0.1.0")] public virtual signal void changed (); } [CCode (cheader_filename = "colord.h", type_id = "cd_sensor_get_type ()")] public class Sensor : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "0.1.6")] public Sensor (); public static Cd.SensorCap cap_from_string (string sensor_cap); public static unowned string cap_to_string (Cd.SensorCap sensor_cap); + [Version (since = "0.1.8")] public async bool connect (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public bool connect_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public bool equal (Cd.Sensor sensor2); + [Version (since = "0.1.26")] public static Cd.SensorError error_from_string (string error_desc); + [Version (since = "0.1.6")] public static GLib.Quark error_quark (); + [Version (since = "0.1.26")] public static unowned string error_to_string (Cd.SensorError error_enum); + [Version (since = "0.1.6")] public uint64 get_caps (); + [Version (since = "0.1.9")] public bool get_connected (); + [Version (since = "0.1.26")] public bool get_embedded (); + [Version (since = "0.1.26")] public unowned string get_id (); + [Version (since = "0.1.6")] public Cd.SensorKind get_kind (); + [Version (since = "0.1.6")] public bool get_locked (); + [Version (since = "0.1.28")] public GLib.HashTable get_metadata (); + [Version (since = "0.1.28")] public unowned string get_metadata_item (string key); + [Version (since = "0.1.6")] public Cd.SensorCap get_mode (); + [Version (since = "0.1.6")] public unowned string get_model (); + [Version (since = "0.1.6")] public bool get_native (); + [Version (since = "0.1.6")] public unowned string get_object_path (); + [Version (since = "0.1.20")] public unowned string get_option (string key); + [Version (since = "0.1.20")] public GLib.HashTable get_options (); + [Version (since = "0.1.8")] public async Cd.ColorXYZ get_sample (Cd.SensorCap cap, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.8")] public Cd.ColorXYZ get_sample_sync (Cd.SensorCap cap, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.6")] public unowned string get_serial (); + [Version (since = "1.3.1")] + public async Cd.Spectrum get_spectrum (Cd.SensorCap cap, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "1.3.1")] + public Cd.Spectrum get_spectrum_sync (Cd.SensorCap cap, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.6")] public Cd.SensorState get_state (); + [Version (since = "0.1.6")] public unowned string get_vendor (); + [Version (since = "0.1.6")] public bool has_cap (Cd.SensorCap cap); public static Cd.SensorKind kind_from_string (string sensor_kind); public static unowned string kind_to_string (Cd.SensorKind sensor_kind); + [Version (since = "0.1.8")] public async bool @lock (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.6")] public bool lock_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "0.1.8")] public void set_object_path (string object_path); + [Version (since = "0.1.20")] public async bool set_options (GLib.HashTable values, GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.20")] public bool set_options_sync (GLib.HashTable values, GLib.Cancellable? cancellable = null) throws GLib.Error; public static Cd.SensorState state_from_string (string sensor_state); public static unowned string state_to_string (Cd.SensorState sensor_state); public string to_string (); + [Version (since = "0.1.8")] public async bool unlock (GLib.Cancellable? cancellable) throws GLib.Error; + [Version (since = "0.1.6")] public bool unlock_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; [CCode (has_construct_function = false)] + [Version (since = "0.1.8")] public Sensor.with_object_path (string object_path); + [Version (since = "0.1.9")] public string connected { get; } + [Version (since = "0.1.26")] public string embedded { get; } + [Version (since = "0.1.26")] public string id { get; } + [Version (since = "0.1.6")] public string kind { get; } + [Version (since = "0.1.6")] public string locked { get; } + [Version (since = "0.1.6")] public string mode { get; } + [Version (since = "0.1.6")] public string model { get; } + [Version (since = "0.1.6")] public string native { get; } + [Version (since = "0.1.8")] public string object_path { get; set construct; } + [Version (since = "0.1.6")] public string serial { get; } + [Version (since = "0.1.6")] public string state { get; } + [Version (since = "0.1.6")] public string vendor { get; } + [Version (since = "0.1.6")] public virtual signal void button_pressed (); } [CCode (cheader_filename = "colord.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cd_spectrum_get_type ()")] [Compact] public class Spectrum { [CCode (has_construct_function = false)] + [Version (since = "1.1.6")] public Spectrum (); + [Version (since = "1.1.6")] public void add_value (double data); + [Version (since = "1.1.6")] public Cd.Spectrum dup (); + [Version (since = "1.1.6")] public void free (); + [Version (since = "1.1.6")] public unowned GLib.Array get_data (); + [Version (since = "1.1.6")] public double get_end (); + [Version (since = "1.1.6")] public unowned string get_id (); + [Version (since = "1.1.6")] public double get_norm (); + [Version (since = "1.2.6")] public double get_resolution (); + [Version (since = "1.1.6")] public uint get_size (); + [Version (since = "1.1.6")] public double get_start (); + [Version (since = "1.1.6")] public double get_value (uint idx); + [Version (since = "1.1.6")] public double get_value_for_nm (double wavelength); + [Version (since = "1.3.1")] + public double get_value_max (); + [Version (since = "1.3.1")] + public double get_value_min (); + [Version (since = "1.2.6")] public double get_value_raw (uint idx); + [Version (since = "1.1.6")] public double get_wavelength (uint idx); + [Version (since = "1.3.1")] + public void get_wavelength_cal (double c1, double c2, double c3); + [Version (since = "1.3.1")] + public void limit_max (double value); + [Version (since = "1.3.1")] + public void limit_min (double value); + [Version (since = "1.1.6")] public Cd.Spectrum multiply (Cd.Spectrum s2, double resolution); + [Version (since = "1.1.6")] public void normalize (double wavelength, double value); + [Version (since = "1.2.6")] public void normalize_max (double value); [CCode (cname = "cd_spectrum_planckian_new", has_construct_function = false)] + [Version (since = "1.1.6")] public Spectrum.planckian_new (double temperature); + [CCode (cname = "cd_spectrum_planckian_new_full", has_construct_function = false)] + [Version (since = "1.3.1")] + public Spectrum.planckian_new_full (double temperature, double start, double end, double resolution); + [Version (since = "1.3.1")] + public Cd.Spectrum resample (double start, double end, double resolution); + [Version (since = "1.1.6")] public void set_data (GLib.Array value); + [Version (since = "1.1.6")] public void set_end (double end); + [Version (since = "1.1.6")] public void set_id (string id); + [Version (since = "1.1.6")] public void set_norm (double norm); + [Version (since = "1.1.6")] public void set_start (double start); + [Version (since = "1.2.6")] public void set_value (uint idx, double data); + [Version (since = "1.3.1")] + public void set_wavelength_cal (double c1, double c2, double c3); [CCode (cname = "cd_spectrum_sized_new", has_construct_function = false)] + [Version (since = "1.1.6")] public Spectrum.sized_new (uint reserved_size); + [Version (since = "1.3.1")] + public Cd.Spectrum subtract (Cd.Spectrum s2, double resolution); + [Version (since = "1.3.1")] + public string to_string (uint max_width, uint max_height); } [CCode (cheader_filename = "colord.h", type_id = "cd_transform_get_type ()")] public class Transform : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "0.1.34")] public Transform (); + [Version (since = "0.1.34")] public static GLib.Quark error_quark (); + [Version (since = "1.0.0")] public unowned Cd.Icc get_abstract_icc (); + [Version (since = "1.0.0")] public bool get_bpc (); + [Version (since = "1.0.0")] public unowned Cd.Icc get_input_icc (); + [Version (since = "1.0.0")] public Cd.PixelFormat get_input_pixel_format (); + [Version (since = "1.1.1")] public uint get_max_threads (); + [Version (since = "1.0.0")] public unowned Cd.Icc get_output_icc (); + [Version (since = "1.0.0")] public Cd.PixelFormat get_output_pixel_format (); + [Version (since = "1.0.0")] public Cd.RenderingIntent get_rendering_intent (); + [Version (since = "0.1.34")] public bool process (void* data_in, void* data_out, uint width, uint height, uint rowstride, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "1.0.0")] public void set_abstract_icc (Cd.Icc icc); + [Version (since = "1.0.0")] public void set_bpc (bool bpc); + [Version (since = "1.0.0")] public void set_input_icc (Cd.Icc icc); + [Version (since = "1.0.0")] public void set_input_pixel_format (Cd.PixelFormat pixel_format); + [Version (since = "1.1.1")] public void set_max_threads (uint max_threads); + [Version (since = "1.0.0")] public void set_output_icc (Cd.Icc icc); + [Version (since = "1.0.0")] public void set_output_pixel_format (Cd.PixelFormat pixel_format); + [Version (since = "1.0.0")] public void set_rendering_intent (Cd.RenderingIntent rendering_intent); public Cd.Icc abstract_icc { get; set; } public bool bpc { get; set; } @@ -757,6 +1267,7 @@ } [CCode (cheader_filename = "colord.h", cprefix = "CD_ICC_LOAD_FLAGS_", has_type_id = false)] [Flags] + [Version (since = "0.1.32")] public enum IccLoadFlags { NONE, NAMED_COLORS, @@ -768,15 +1279,18 @@ ALL } [CCode (cheader_filename = "colord.h", cprefix = "CD_ICC_SAVE_FLAGS_", has_type_id = false)] + [Version (since = "0.1.32")] public enum IccSaveFlags { NONE } [CCode (cheader_filename = "colord.h", cprefix = "CD_ICC_STORE_SEARCH_FLAGS_", has_type_id = false)] + [Version (since = "1.1.1")] public enum IccStoreSearchFlags { NONE, CREATE_LOCATION } [CCode (cheader_filename = "colord.h", cprefix = "CD_ICC_STORE_SEARCH_KIND_", has_type_id = false)] + [Version (since = "1.1.1")] public enum IccStoreSearchKind { SYSTEM, MACHINE, @@ -886,9 +1400,13 @@ LCD_RGB_LED, LCD_WHITE_LED, WIDE_GAMUT_LCD_CCFL, - WIDE_GAMUT_LCD_RGB_LED + WIDE_GAMUT_LCD_RGB_LED, + SPECTRAL, + CALIBRATION_DARK, + CALIBRATION_IRRADIANCE } [CCode (cheader_filename = "colord.h", cprefix = "CD_SENSOR_ERROR_", has_type_id = false)] + [Version (since = "0.1.26")] public enum SensorError { NO_SUPPORT, NO_DATA, @@ -898,7 +1416,9 @@ IN_USE, FAILED_TO_AUTHENTICATE, REQUIRED_POSITION_CALIBRATE, - REQUIRED_POSITION_SURFACE + REQUIRED_POSITION_SURFACE, + REQUIRED_DARK_CALIBRATION, + REQUIRED_IRRADIANCE_CALIBRATION } [CCode (cheader_filename = "colord.h", cprefix = "CD_SENSOR_KIND_", has_type_id = false)] public enum SensorKind { @@ -948,6 +1468,7 @@ public static unowned string to_string (Cd.StandardSpace standard_space); } [CCode (cheader_filename = "colord.h", cprefix = "CD_TRANSFORM_ERROR_", has_type_id = false)] + [Version (since = "0.1.34")] public enum TransformError { FAILED_TO_SETUP_TRANSFORM, INVALID_COLORSPACE, @@ -1178,8 +1699,10 @@ [CCode (cheader_filename = "colord.h")] public static void buffer_write_uint32_le (uint8 buffer, uint32 value); [CCode (cheader_filename = "colord.h")] + [Version (since = "0.1.26")] public static bool color_get_blackbody_rgb (uint temp, Cd.ColorRGB result); [CCode (cheader_filename = "colord.h")] + [Version (since = "0.1.27")] public static void color_rgb8_to_rgb (Cd.ColorRGB8 src, Cd.ColorRGB dest); [CCode (cheader_filename = "colord.h")] public static bool context_lcms_error_check (void* ctx) throws GLib.Error; diff -Nru colord-1.2.12/lib/colord/Makefile.am colord-1.3.2/lib/colord/Makefile.am --- colord-1.2.12/lib/colord/Makefile.am 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colord/Makefile.am 2015-10-13 15:24:13.000000000 +0000 @@ -59,7 +59,6 @@ cd-version.h libcolordprivate_la_SOURCES = \ - cd-cleanup.h \ cd-context-lcms.c \ cd-context-lcms.h \ cd-buffer.c \ diff -Nru colord-1.2.12/lib/colord/Makefile.in colord-1.3.2/lib/colord/Makefile.in --- colord-1.2.12/lib/colord/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/lib/colord/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -574,6 +574,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -678,6 +679,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -739,7 +741,6 @@ cd-version.h libcolordprivate_la_SOURCES = \ - cd-cleanup.h \ cd-context-lcms.c \ cd-context-lcms.h \ cd-buffer.c \ diff -Nru colord-1.2.12/lib/colorhug/ch-common.c colord-1.3.2/lib/colorhug/ch-common.c --- colord-1.2.12/lib/colorhug/ch-common.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-common.c 2016-02-17 13:41:32.000000000 +0000 @@ -215,7 +215,7 @@ * Since: 0.1.29 **/ const gchar * -ch_command_to_string (guint8 cmd) +ch_command_to_string (ChCmd cmd) { const char *str = NULL; switch (cmd) { @@ -345,6 +345,27 @@ case CH_CMD_GET_TEMPERATURE: str = "get-temperature"; break; + case CH_CMD_GET_ERROR: + str = "get-error"; + break; + case CH_CMD_CLEAR_ERROR: + str = "clear-error"; + break; + case CH_CMD_TAKE_READING_SPECTRAL: + str = "take-reading-spectral"; + break; + case CH_CMD_GET_ADC_CALIBRATION_POS: + str = "get-adc-calibration-pos"; + break; + case CH_CMD_GET_ADC_CALIBRATION_NEG: + str = "get-adc-calibration-neg"; + break; + case CH_CMD_GET_CCD_CALIBRATION: + str = "get-ccd-calibration"; + break; + case CH_CMD_SET_CCD_CALIBRATION: + str = "set-ccd-calibration"; + break; default: str = "unknown-command"; break; diff -Nru colord-1.2.12/lib/colorhug/ch-common.h colord-1.3.2/lib/colorhug/ch-common.h --- colord-1.2.12/lib/colorhug/ch-common.h 2015-05-28 07:44:26.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-common.h 2016-02-17 13:41:32.000000000 +0000 @@ -1165,9 +1165,18 @@ * * Read in raw data from the SRAM memory. * + * PROTOCOLv1: * IN: [1:cmd][2:address][1:length] * OUT: [1:retval][1:cmd][1-60:data] * + * PROTOCOLv2: + * bRequest: [cmd] + * wValue: [address-index/64] + * wIndex: interface + * wLength: 0x64 + * Direction: DEVICE->HOST + * Data: [64:DATA] + * * This command is available under these conditions: * * | Bootloader | Firmware @@ -1287,6 +1296,87 @@ **/ #define CH_CMD_SELF_TEST 0x40 +/** + * CH_CMD_GET_ERROR: + * + * Gets any recorded error from the device. + * + * PROTOCOLv2: + * bRequest: [cmd] + * wValue: 0x00 + * wIndex: interface + * wLength: 0x00 + * Direction: DEVICE->HOST + * Data: [1:error][1:cmd] + * + * This command is available under these conditions: + * + * | Bootloader | Firmware + * ---------------+--------------+----------- + * ColorHug | × | × + * ColorHug2 | × | × + * ColorHug+ | × | ✓ + * ColorHugALS | × | × + * + * Since: 1.3.1 + **/ +#define CH_CMD_GET_ERROR 0x60 + +/** + * CH_CMD_CLEAR_ERROR: + * + * Clears any recorded error on the device. + * + * PROTOCOLv2: + * bRequest: [cmd] + * wValue: 0x00 + * wIndex: interface + * wLength: 0x00 + * Direction: DEVICE->HOST + * Data: [] + * + * This command is available under these conditions: + * + * | Bootloader | Firmware + * ---------------+--------------+----------- + * ColorHug | × | × + * ColorHug2 | × | × + * ColorHug+ | × | ✓ + * ColorHugALS | × | × + * + * Since: 1.3.1 + **/ +#define CH_CMD_CLEAR_ERROR 0x61 + +/** + * CH_CMD_SET_CRYPTO_KEY: + * + * Sets the 128 bit encyption key for the device. + * + * PROTOCOLv2: + * bRequest: [cmd] + * wValue: 0x00 + * wIndex: interface + * wLength: 0x00 + * Direction: DEVICE->HOST + * Data: [4:key0][4:key1][4:key2][4:key3] + * + * This command is available under these conditions: + * + * | Bootloader | Firmware + * ---------------+--------------+----------- + * ColorHug | × | × + * ColorHug2 | × | × + * ColorHug+ | × | ✓ + * ColorHugALS | × | × + * + * Since: 1.3.1 + **/ +#define CH_CMD_SET_CRYPTO_KEY 0x70 + +/* these are not yet in the API */ +#define CH_EP0_TRANSFER_SIZE 64 + /* secret code */ #define CH_WRITE_EEPROM_MAGIC "Un1c0rn2" #define CH_FIRMWARE_ID_TOKEN1 "40338ceb" @@ -1442,9 +1532,11 @@ CH_DEVICE_MODE_LAST } ChDeviceMode; +typedef guint8 ChCmd; + /* prototypes */ const gchar *ch_strerror (ChError error_enum); -const gchar *ch_command_to_string (guint8 cmd); +const gchar *ch_command_to_string (ChCmd cmd); const gchar *ch_multiplier_to_string (ChFreqScale multiplier); const gchar *ch_color_select_to_string (ChColorSelect color_select); const gchar *ch_measure_mode_to_string (ChMeasureMode measure_mode); diff -Nru colord-1.2.12/lib/colorhug/ch-device.c colord-1.3.2/lib/colorhug/ch-device.c --- colord-1.2.12/lib/colorhug/ch-device.c 2015-05-28 07:44:26.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-device.c 2016-03-03 09:37:01.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2011-2015 Richard Hughes + * Copyright (C) 2011-2016 Richard Hughes * * Licensed under the GNU General Public License Version 2 * @@ -54,20 +54,7 @@ gboolean ch_device_open (GUsbDevice *device, GError **error) { - g_return_val_if_fail (G_USB_IS_DEVICE (device), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - /* load device */ - if (!g_usb_device_open (device, error)) - return FALSE; - if (!g_usb_device_set_configuration (device, CH_USB_CONFIG, error)) - return FALSE; - if (!g_usb_device_claim_interface (device, - CH_USB_INTERFACE, - G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER, - error)) - return FALSE; - return TRUE; + return ch_device_open_full (device, NULL, error); } /** @@ -180,9 +167,6 @@ } typedef struct { - GUsbDevice *device; - GCancellable *cancellable; - GSimpleAsyncResult *res; guint8 *buffer; guint8 *buffer_orig; guint8 *buffer_out; @@ -191,7 +175,7 @@ guint retried_cnt; guint8 report_type; /* only for Sensor HID */ guint report_length; /* only for Sensor HID */ -} ChDeviceHelper; +} ChDeviceTaskData; /** * ch_device_write_command_finish: @@ -210,35 +194,19 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (G_USB_IS_DEVICE (device), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } /** - * ch_device_free_helper: + * ch_device_task_data_free: **/ static void -ch_device_free_helper (ChDeviceHelper *helper) +ch_device_task_data_free (ChDeviceTaskData *tdata) { - /* clear busy flag */ - g_object_steal_data (G_OBJECT (helper->device), - "ChCommonDeviceBusy"); - if (helper->cancellable != NULL) - g_object_unref (helper->cancellable); - g_object_unref (helper->device); - g_object_unref (helper->res); - g_free (helper->buffer); - g_free (helper->buffer_orig); - g_free (helper); + g_free (tdata->buffer); + g_free (tdata->buffer_orig); + g_free (tdata); } static void ch_device_request_cb (GObject *source_object, GAsyncResult *res, gpointer user_data); @@ -256,52 +224,55 @@ gsize actual_len; gchar *msg = NULL; GUsbDevice *device = G_USB_DEVICE (source_object); - ChDeviceHelper *helper = (ChDeviceHelper *) user_data; + GTask *task = G_TASK (user_data); + ChDeviceTaskData *tdata = g_task_get_task_data (task); /* get the result */ actual_len = g_usb_device_interrupt_transfer_finish (device, res, &error); if ((gssize) actual_len < 0) { - g_simple_async_result_take_error (helper->res, error); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_new_error (task, + CH_DEVICE_ERROR, + CH_ERROR_INVALID_VALUE, + "%s", error->message); + g_object_unref (task); return; } /* parse the reply */ if (g_getenv ("COLORHUG_VERBOSE") != NULL) { ch_print_data_buffer ("reply", - helper->buffer, + tdata->buffer, actual_len); } /* parse */ - if (helper->buffer[CH_BUFFER_OUTPUT_RETVAL] != CH_ERROR_NONE || - helper->buffer[CH_BUFFER_OUTPUT_CMD] != helper->cmd || - (actual_len != helper->buffer_out_len + CH_BUFFER_OUTPUT_DATA && + if (tdata->buffer[CH_BUFFER_OUTPUT_RETVAL] != CH_ERROR_NONE || + tdata->buffer[CH_BUFFER_OUTPUT_CMD] != tdata->cmd || + (actual_len != tdata->buffer_out_len + CH_BUFFER_OUTPUT_DATA && actual_len != CH_USB_HID_EP_SIZE)) { - error_enum = helper->buffer[CH_BUFFER_OUTPUT_RETVAL]; + error_enum = tdata->buffer[CH_BUFFER_OUTPUT_RETVAL]; /* handle incomplete previous request */ if (error_enum == CH_ERROR_INCOMPLETE_REQUEST && - helper->retried_cnt == 0) { - helper->retried_cnt++; - memcpy (helper->buffer, helper->buffer_orig, CH_USB_HID_EP_SIZE); + tdata->retried_cnt == 0) { + tdata->retried_cnt++; + memcpy (tdata->buffer, tdata->buffer_orig, CH_USB_HID_EP_SIZE); if (g_getenv ("COLORHUG_VERBOSE") != NULL) { ch_print_data_buffer ("request", - helper->buffer, + tdata->buffer, CH_USB_HID_EP_SIZE); } - g_usb_device_interrupt_transfer_async (helper->device, + g_usb_device_interrupt_transfer_async (device, CH_USB_HID_EP_OUT, - helper->buffer, + tdata->buffer, CH_USB_HID_EP_SIZE, CH_DEVICE_USB_TIMEOUT, - helper->cancellable, + g_task_get_cancellable (task), ch_device_request_cb, - helper); - /* we're re-using the helper, so don't deallocate it */ + tdata); + /* we're re-using the tdata, so don't deallocate it */ return; } @@ -310,33 +281,31 @@ "len=%" G_GSIZE_FORMAT " (expected %" G_GSIZE_FORMAT " or %i)", error_enum, ch_strerror (error_enum), - helper->buffer[CH_BUFFER_OUTPUT_CMD], - ch_command_to_string (helper->buffer[CH_BUFFER_OUTPUT_CMD]), - helper->cmd, - ch_command_to_string (helper->cmd), + tdata->buffer[CH_BUFFER_OUTPUT_CMD], + ch_command_to_string (tdata->buffer[CH_BUFFER_OUTPUT_CMD]), + tdata->cmd, + ch_command_to_string (tdata->cmd), actual_len, - helper->buffer_out_len + CH_BUFFER_OUTPUT_DATA, + tdata->buffer_out_len + CH_BUFFER_OUTPUT_DATA, CH_USB_HID_EP_SIZE); - g_simple_async_result_set_error (helper->res, - CH_DEVICE_ERROR, - error_enum, - "%s", msg); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_new_error (task, + CH_DEVICE_ERROR, + error_enum, + "%s", msg); + g_object_unref (task); return; } /* copy */ - if (helper->buffer_out != NULL) { - memcpy (helper->buffer_out, - helper->buffer + CH_BUFFER_OUTPUT_DATA, - helper->buffer_out_len); + if (tdata->buffer_out != NULL) { + memcpy (tdata->buffer_out, + tdata->buffer + CH_BUFFER_OUTPUT_DATA, + tdata->buffer_out_len); } /* success */ - g_simple_async_result_set_op_res_gboolean (helper->res, TRUE); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_boolean (task, TRUE); + g_object_unref (task); } /** @@ -350,28 +319,31 @@ GError *error = NULL; gssize actual_len; GUsbDevice *device = G_USB_DEVICE (source_object); - ChDeviceHelper *helper = (ChDeviceHelper *) user_data; + GTask *task = G_TASK (user_data); + ChDeviceTaskData *tdata = g_task_get_task_data (task); /* get the result */ actual_len = g_usb_device_interrupt_transfer_finish (device, res, &error); if (actual_len < CH_USB_HID_EP_SIZE) { - g_simple_async_result_take_error (helper->res, error); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_new_error (task, + CH_DEVICE_ERROR, + CH_ERROR_INVALID_VALUE, + "%s", error->message); + g_object_unref (task); return; } /* request the reply */ - g_usb_device_interrupt_transfer_async (helper->device, + g_usb_device_interrupt_transfer_async (device, CH_USB_HID_EP_IN, - helper->buffer, + tdata->buffer, CH_USB_HID_EP_SIZE, CH_DEVICE_USB_TIMEOUT, - helper->cancellable, + g_task_get_cancellable (task), ch_device_reply_cb, - helper); + task); } /** @@ -380,29 +352,29 @@ static gboolean ch_device_emulate_cb (gpointer user_data) { - ChDeviceHelper *helper = (ChDeviceHelper *) user_data; + GTask *task = G_TASK (user_data); + ChDeviceTaskData *tdata = g_task_get_task_data (task); - switch (helper->cmd) { + switch (tdata->cmd) { case CH_CMD_GET_SERIAL_NUMBER: - helper->buffer_out[6] = 42; + tdata->buffer_out[6] = 42; break; case CH_CMD_GET_FIRMWARE_VERSION: - helper->buffer_out[0] = 0x01; - helper->buffer_out[4] = 0x01; + tdata->buffer_out[0] = 0x01; + tdata->buffer_out[4] = 0x01; break; case CH_CMD_GET_HARDWARE_VERSION: - helper->buffer_out[0] = 0xff; + tdata->buffer_out[0] = 0xff; break; default: g_debug ("Ignoring command %s", - ch_command_to_string (helper->cmd)); + ch_command_to_string (tdata->cmd)); break; } /* success */ - g_simple_async_result_set_op_res_gboolean (helper->res, TRUE); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_boolean (task, TRUE); + g_object_unref (task); return G_SOURCE_REMOVE; } @@ -426,24 +398,26 @@ GError *error = NULL; gssize actual_len; GUsbDevice *device = G_USB_DEVICE (source_object); - ChDeviceHelper *helper = (ChDeviceHelper *) user_data; + GTask *task = G_TASK (user_data); + ChDeviceTaskData *tdata = g_task_get_task_data (task); /* get the result */ actual_len = g_usb_device_control_transfer_finish (device, res, &error); - if (actual_len != helper->report_length) { - g_simple_async_result_take_error (helper->res, error); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + if (actual_len != tdata->report_length) { + g_task_return_new_error (task, + CH_DEVICE_ERROR, + CH_ERROR_INVALID_VALUE, + "%s", error->message); + g_object_unref (task); return; } -// ch_print_data_buffer ("reply", helper->buffer, helper->report_length); +// ch_print_data_buffer ("reply", tdata->buffer, tdata->report_length); /* success */ - g_simple_async_result_set_op_res_gboolean (helper->res, TRUE); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_boolean (task, TRUE); + g_object_unref (task); } /** @@ -457,26 +431,28 @@ GError *error = NULL; gsize actual_len; GUsbDevice *device = G_USB_DEVICE (source_object); - ChDeviceHelper *helper = (ChDeviceHelper *) user_data; + GTask *task = G_TASK (user_data); + ChDeviceTaskData *tdata = g_task_get_task_data (task); /* get the result */ actual_len = g_usb_device_interrupt_transfer_finish (device, res, &error); if ((gssize) actual_len < 0) { - g_simple_async_result_take_error (helper->res, error); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_new_error (task, + CH_DEVICE_ERROR, + CH_ERROR_INVALID_VALUE, + "%s", error->message); + g_object_unref (task); return; } - /* copy out data */ - memcpy (helper->buffer_out, helper->buffer + 3, 4); + /* copy out tdata */ + memcpy (tdata->buffer_out, tdata->buffer + 3, 4); /* success */ - g_simple_async_result_set_op_res_gboolean (helper->res, TRUE); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_boolean (task, TRUE); + g_object_unref (task); } /** @@ -491,106 +467,107 @@ gssize actual_len; gboolean another_request_required = FALSE; GUsbDevice *device = G_USB_DEVICE (source_object); - ChDeviceHelper *helper = (ChDeviceHelper *) user_data; + GTask *task = G_TASK (user_data); + ChDeviceTaskData *tdata = g_task_get_task_data (task); /* get the result */ actual_len = g_usb_device_control_transfer_finish (device, res, &error); - if (actual_len != helper->report_length) { - g_simple_async_result_take_error (helper->res, error); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + if (actual_len != tdata->report_length) { + g_task_return_new_error (task, + CH_DEVICE_ERROR, + CH_ERROR_INVALID_VALUE, + "%s", error->message); + g_object_unref (task); return; } -// ch_print_data_buffer ("reply", helper->buffer, helper->report_length); +// ch_print_data_buffer ("reply", tdata->buffer, tdata->report_length); - switch (helper->cmd) { + switch (tdata->cmd) { case CH_CMD_TAKE_READING_RAW: - memcpy(helper->buffer_out, helper->buffer + 3, 4); + memcpy (tdata->buffer_out, tdata->buffer + 3, 4); break; case CH_CMD_GET_COLOR_SELECT: - memcpy(helper->buffer_out, helper->buffer + 1, 1); + memcpy (tdata->buffer_out, tdata->buffer + 1, 1); break; case CH_CMD_GET_INTEGRAL_TIME: - memcpy(helper->buffer_out, helper->buffer + 4, 2); + memcpy (tdata->buffer_out, tdata->buffer + 4, 2); break; case CH_CMD_GET_LEDS: - memcpy(helper->buffer_out, helper->buffer + 2, 1); + memcpy (tdata->buffer_out, tdata->buffer + 2, 1); break; case CH_CMD_GET_MULTIPLIER: - memcpy(helper->buffer_out, helper->buffer + 3, 1); + memcpy (tdata->buffer_out, tdata->buffer + 3, 1); break; case CH_CMD_GET_FIRMWARE_VERSION: - memcpy(helper->buffer_out, helper->buffer + 2, 6); + memcpy (tdata->buffer_out, tdata->buffer + 2, 6); break; case CH_CMD_GET_HARDWARE_VERSION: - memcpy(helper->buffer_out, helper->buffer + 1, 1); + memcpy (tdata->buffer_out, tdata->buffer + 1, 1); break; case CH_CMD_GET_SERIAL_NUMBER: - memcpy(helper->buffer_out, helper->buffer + 8, 4); + memcpy (tdata->buffer_out, tdata->buffer + 8, 4); break; case CH_CMD_SET_COLOR_SELECT: - memcpy(helper->buffer + 1, helper->buffer_orig + 1, 1); + memcpy (tdata->buffer + 1, tdata->buffer_orig + 1, 1); another_request_required = TRUE; break; case CH_CMD_SET_INTEGRAL_TIME: - memcpy(helper->buffer + 4, helper->buffer_orig + 1, 2); + memcpy (tdata->buffer + 4, tdata->buffer_orig + 1, 2); another_request_required = TRUE; break; case CH_CMD_SET_LEDS: - memcpy(helper->buffer + 2, helper->buffer_orig + 1, 1); + memcpy (tdata->buffer + 2, tdata->buffer_orig + 1, 1); another_request_required = TRUE; break; case CH_CMD_SET_MULTIPLIER: - memcpy(helper->buffer + 3, helper->buffer_orig + 1, 1); + memcpy (tdata->buffer + 3, tdata->buffer_orig + 1, 1); another_request_required = TRUE; break; case CH_CMD_SET_FLASH_SUCCESS: - memcpy(helper->buffer + 13, helper->buffer_orig + 1, 1); + memcpy (tdata->buffer + 13, tdata->buffer_orig + 1, 1); another_request_required = TRUE; break; case CH_CMD_RESET: - helper->buffer[12] = 1; + tdata->buffer[12] = 1; another_request_required = TRUE; break; case CH_CMD_SET_SERIAL_NUMBER: - memcpy(helper->buffer + 8, helper->buffer_orig + 1, 4); + memcpy (tdata->buffer + 8, tdata->buffer_orig + 1, 4); another_request_required = TRUE; break; default: - g_simple_async_result_set_error (helper->res, - CH_DEVICE_ERROR, - CH_ERROR_UNKNOWN_CMD, - "No Sensor HID support for 0x%02x", - helper->cmd); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_new_error (task, + CH_DEVICE_ERROR, + CH_ERROR_UNKNOWN_CMD, + "No Sensor HID support for 0x%02x", + tdata->cmd); + g_object_unref (task); return; } /* getting the value was enough */ if (!another_request_required) { - g_simple_async_result_set_op_res_gboolean (helper->res, TRUE); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_boolean (task, TRUE); + g_object_unref (task); return; } -// ch_print_data_buffer ("request", helper->buffer, helper->report_length); +// ch_print_data_buffer ("request", tdata->buffer, tdata->report_length); g_usb_device_control_transfer_async (device, G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, CH_SENSOR_HID_REPORT_SET, - CH_SENSOR_HID_FEATURE | helper->report_type, + CH_SENSOR_HID_FEATURE | tdata->report_type, 0x0000, - helper->buffer, - helper->report_length, + tdata->buffer, + tdata->report_length, CH_DEVICE_USB_TIMEOUT, - helper->cancellable, + g_task_get_cancellable (task), ch_device_sensor_hid_set_cb, - helper); + task); } /** @@ -620,71 +597,51 @@ GAsyncReadyCallback callback, gpointer user_data) { - ChDeviceHelper *helper; - gpointer device_busy; - + ChDeviceTaskData *tdata; + GTask *task = NULL; g_return_if_fail (G_USB_IS_DEVICE (device)); g_return_if_fail (cmd != 0); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - helper = g_new0 (ChDeviceHelper, 1); - helper->device = g_object_ref (device); - helper->buffer_out = buffer_out; - helper->buffer_out_len = buffer_out_len; - helper->buffer = g_new0 (guint8, CH_USB_HID_EP_SIZE); - helper->res = g_simple_async_result_new (G_OBJECT (device), - callback, - user_data, - ch_device_write_command_async); - if (cancellable != NULL) - helper->cancellable = g_object_ref (cancellable); - - /* device busy processing another command */ - device_busy = g_object_get_data (G_OBJECT (device), - "ChCommonDeviceBusy"); - if (device_busy != NULL) { - g_simple_async_result_set_error (helper->res, 1, 0, "Device busy!"); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); - return; - } + task = g_task_new (device, cancellable, callback, user_data); + + tdata = g_new0 (ChDeviceTaskData, 1); + tdata->buffer_out = buffer_out; + tdata->buffer_out_len = buffer_out_len; + tdata->buffer = g_new0 (guint8, CH_USB_HID_EP_SIZE); + g_task_set_task_data (task, tdata, (GDestroyNotify) ch_device_task_data_free); /* set command */ - helper->cmd = cmd; - helper->buffer[CH_BUFFER_INPUT_CMD] = helper->cmd; + tdata->cmd = cmd; + tdata->buffer[CH_BUFFER_INPUT_CMD] = tdata->cmd; if (buffer_in != NULL) { - memcpy (helper->buffer + CH_BUFFER_INPUT_DATA, + memcpy (tdata->buffer + CH_BUFFER_INPUT_DATA, buffer_in, buffer_in_len); } - helper->buffer_orig = g_memdup (helper->buffer, CH_USB_HID_EP_SIZE); + tdata->buffer_orig = g_memdup (tdata->buffer, CH_USB_HID_EP_SIZE); /* request */ if (g_getenv ("COLORHUG_VERBOSE") != NULL) { ch_print_data_buffer ("request", - helper->buffer, + tdata->buffer, buffer_in_len + 1); } /* dummy hardware */ if (g_getenv ("COLORHUG_EMULATE") != NULL) { - g_timeout_add (20, ch_device_emulate_cb, helper); + g_timeout_add (20, ch_device_emulate_cb, tdata); return; } - /* set a private flag so we don't do reentrancy */ - g_object_set_data (G_OBJECT (device), - "ChCommonDeviceBusy", - GUINT_TO_POINTER (TRUE)); - /* handle ALS in sensor-hid mode differently */ if (g_usb_device_get_pid (device) == CH_USB_PID_FIRMWARE_ALS_SENSOR_HID) { /* try to map the commands to Sensor HID requests */ - switch (helper->cmd) { + switch (tdata->cmd) { case CH_CMD_TAKE_READING_RAW: - helper->report_type = CH_REPORT_ALS; - helper->report_length = 7; + tdata->report_type = CH_REPORT_ALS; + tdata->report_length = 7; break; case CH_CMD_GET_COLOR_SELECT: case CH_CMD_GET_INTEGRAL_TIME: @@ -694,8 +651,8 @@ case CH_CMD_SET_INTEGRAL_TIME: case CH_CMD_SET_LEDS: case CH_CMD_SET_MULTIPLIER: - helper->report_type = CH_REPORT_SENSOR_SETTINGS; - helper->report_length = 6; + tdata->report_type = CH_REPORT_SENSOR_SETTINGS; + tdata->report_length = 6; break; case CH_CMD_GET_FIRMWARE_VERSION: case CH_CMD_GET_HARDWARE_VERSION: @@ -703,62 +660,60 @@ case CH_CMD_RESET: case CH_CMD_SET_FLASH_SUCCESS: case CH_CMD_SET_SERIAL_NUMBER: - helper->report_type = CH_REPORT_SYSTEM_SETTINGS; - helper->report_length = 14; + tdata->report_type = CH_REPORT_SYSTEM_SETTINGS; + tdata->report_length = 14; break; default: - g_simple_async_result_set_error (helper->res, - CH_DEVICE_ERROR, - CH_ERROR_UNKNOWN_CMD, - "No Sensor HID support for 0x%02x", - helper->cmd); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_free_helper (helper); + g_task_return_new_error (task, + CH_DEVICE_ERROR, + CH_ERROR_UNKNOWN_CMD, + "No Sensor HID support for 0x%02x", + tdata->cmd); + g_object_unref (task); return; } /* need to use this rather than feature control */ - if (helper->report_type == CH_REPORT_ALS) { - g_usb_device_interrupt_transfer_async (helper->device, + if (tdata->report_type == CH_REPORT_ALS) { + g_usb_device_interrupt_transfer_async (device, CH_USB_HID_EP_IN, - helper->buffer, - helper->report_length, + tdata->buffer, + tdata->report_length, CH_DEVICE_USB_TIMEOUT, - helper->cancellable, + g_task_get_cancellable (task), ch_device_sensor_hid_report_cb, - helper); + task); return; } /* do control transfer */ - memset(helper->buffer, '\0', helper->report_length); -// ch_print_data_buffer ("request", helper->buffer, helper->report_length); + memset(tdata->buffer, '\0', tdata->report_length); +// ch_print_data_buffer ("request", tdata->buffer, tdata->report_length); g_usb_device_control_transfer_async (device, G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, G_USB_DEVICE_REQUEST_TYPE_CLASS, G_USB_DEVICE_RECIPIENT_INTERFACE, CH_SENSOR_HID_REPORT_GET, - CH_SENSOR_HID_FEATURE | helper->report_type, + CH_SENSOR_HID_FEATURE | tdata->report_type, 0x0000, - helper->buffer, - helper->report_length, + tdata->buffer, + tdata->report_length, CH_DEVICE_USB_TIMEOUT, - helper->cancellable, + g_task_get_cancellable (task), ch_device_sensor_hid_get_cb, - helper); + task); return; - } /* do interrupt transfer */ - g_usb_device_interrupt_transfer_async (helper->device, + g_usb_device_interrupt_transfer_async (device, CH_USB_HID_EP_OUT, - helper->buffer, + tdata->buffer, CH_USB_HID_EP_SIZE, CH_DEVICE_USB_TIMEOUT, - helper->cancellable, + g_task_get_cancellable (task), ch_device_request_cb, - helper); + task); } /* tiny helper to help us do the async operation */ @@ -975,3 +930,1287 @@ return CH_DEVICE_GUID_COLORHUG_ALS; return NULL; } + +/** + * ch_device_get_protocol_ver: + **/ +static guint8 +ch_device_get_protocol_ver (GUsbDevice *device) +{ + switch (ch_device_get_mode (device)) { + case CH_DEVICE_MODE_BOOTLOADER: + case CH_DEVICE_MODE_BOOTLOADER2: + case CH_DEVICE_MODE_BOOTLOADER_ALS: + case CH_DEVICE_MODE_FIRMWARE: + case CH_DEVICE_MODE_FIRMWARE2: + case CH_DEVICE_MODE_FIRMWARE_ALS: + case CH_DEVICE_MODE_LEGACY: + return 0x1; + case CH_DEVICE_MODE_FIRMWARE_PLUS: + return 0x2; + default: + break; + } + return 0x0; +} + +/** + * ch_offset_float_to_double: + **/ +static gdouble +ch_offset_float_to_double (gint32 tmp) +{ + return (gdouble) tmp / (gdouble) 0xffff; +} + +/** + * ch_offset_float_from_double: + **/ +static gint32 +ch_offset_float_from_double (gdouble tmp) +{ + return tmp * 0xffff; +} + +/** + * ch_device_check_status: + **/ +static gboolean +ch_device_check_status (GUsbDevice *device, GCancellable *cancellable, GError **error) +{ + ChError status; + ChCmd cmd; + + /* hit hardware */ + if (!ch_device_get_error (device, &status, &cmd, cancellable, error)) + return FALSE; + + /* formulate error */ + if (status != CH_ERROR_NONE) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Failed, %s(0x%02x) status was %s(0x%02x)", + ch_command_to_string (cmd), cmd, + ch_strerror (status), status); + return FALSE; + } + return TRUE; +} + +/** + * ch_device_self_test: + * @device: A #GUsbDevice + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Performs a self test on the device + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_self_test (GUsbDevice *device, + GCancellable *cancellable, + GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + if (protocol_ver == 1) { + return ch_device_write_command (device, + CH_CMD_SELF_TEST, + NULL, + 0, + NULL, + 0, + cancellable, + error); + } + if (protocol_ver == 2) { + return g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_SELF_TEST, + 0, /* wValue */ + CH_USB_INTERFACE, /* idx */ + NULL, /* data */ + 0, /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Self test is not supported"); + return FALSE; +} + +/** + * ch_device_set_serial_number: + * @device: A #GUsbDevice + * @value: serial number + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Sets the serial number on the device + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_set_serial_number (GUsbDevice *device, guint32 value, + GCancellable *cancellable, GError **error) +{ + guint32 value_le; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + value_le = GUINT32_TO_LE (value); + if (protocol_ver == 1) { + return ch_device_write_command (device, + CH_CMD_SET_SERIAL_NUMBER, + (const guint8 *) &value_le, + sizeof(value_le), + NULL, + 0, + cancellable, + error); + } + if (protocol_ver == 2) { + return g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_SET_SERIAL_NUMBER, + value_le, /* wValue */ + CH_USB_INTERFACE, /* idx */ + NULL, /* data */ + 0, /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Setting the serial number is not supported"); + return FALSE; +} + +/** + * ch_device_get_serial_number: + * @device: A #GUsbDevice + * @value: (out): serial number + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Gets the serial number from the device. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_get_serial_number (GUsbDevice *device, guint32 *value, + GCancellable *cancellable, GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver == 1) { + return ch_device_write_command (device, + CH_CMD_GET_SERIAL_NUMBER, + NULL, + 0, + (guint8 *) value, + sizeof(guint32), + cancellable, + error); + } + if (protocol_ver == 2) { + guint8 buf[2]; + gsize actual_length; + gboolean ret; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_GET_SERIAL_NUMBER, + 0x00, /* wValue */ + CH_USB_INTERFACE, /* idx */ + buf, /* data */ + sizeof(buf), /* length */ + &actual_length, + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* return result */ + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Invalid size, got %li", actual_length); + return FALSE; + } + if (value != NULL) + memcpy (value, buf, sizeof(buf)); + return TRUE; + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting the serial number is not supported"); + return FALSE; +} + +/** + * ch_device_set_leds: + * @device: A #GUsbDevice + * @value: serial number + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Sets the LEDs on the device + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_set_leds (GUsbDevice *device, ChStatusLed value, + GCancellable *cancellable, GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + if (protocol_ver == 1) { + guint8 buffer[4] = { value, 0, 0, 0 }; + return ch_device_write_command (device, + CH_CMD_SET_LEDS, + (const guint8 *) buffer, + sizeof(buffer), + NULL, + 0, + cancellable, + error); + } + if (protocol_ver == 2) { + return g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_SET_LEDS, + value, /* wValue */ + CH_USB_INTERFACE, /* idx */ + NULL, /* data */ + 0, /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Setting the LEDs is not supported"); + return FALSE; +} + +/** + * ch_device_get_leds: + * @device: A #GUsbDevice + * @value: (out): serial number + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Gets the LEDs from the device. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_get_leds (GUsbDevice *device, ChStatusLed *value, + GCancellable *cancellable, GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver == 1) { + return ch_device_write_command (device, + CH_CMD_GET_LEDS, + NULL, + 0, + (guint8 *) value, + sizeof(ChStatusLed), + cancellable, + error); + } + if (protocol_ver == 2) { + guint8 buf[1]; + gsize actual_length; + gboolean ret; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_GET_LEDS, + 0x00, /* wValue */ + CH_USB_INTERFACE, /* idx */ + buf, /* data */ + sizeof(buf), /* length */ + &actual_length, + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* return result */ + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Invalid size, got %li", actual_length); + return FALSE; + } + if (value != NULL) + memcpy (value, buf, sizeof(buf)); + return TRUE; + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting the LEDs is not supported"); + return FALSE; +} + +/** + * ch_device_set_pcb_errata: + * @device: A #GUsbDevice + * @value: #ChPcbErrata, e.g. %CH_PCB_ERRATA_SWAPPED_LEDS + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Sets any PCB errata on the device + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_set_pcb_errata (GUsbDevice *device, ChPcbErrata value, + GCancellable *cancellable, GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver == 1) { + gboolean ret; + ret = ch_device_write_command (device, + CH_CMD_SET_PCB_ERRATA, + (guint8 *) &value, + sizeof(guint8), + NULL, + 0, + cancellable, + error); + if (!ret) + return FALSE; + return ch_device_write_command (device, + CH_CMD_WRITE_EEPROM, + (guint8 *) CH_WRITE_EEPROM_MAGIC, + strlen (CH_WRITE_EEPROM_MAGIC), + NULL, + 0, + cancellable, + error); + } + if (protocol_ver == 2) { + return g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_SET_PCB_ERRATA, + value, /* wValue */ + CH_USB_INTERFACE, /* idx */ + NULL, /* data */ + 0, /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Setting the PCB errata is not supported"); + return FALSE; +} + +/** + * ch_device_get_pcb_errata: + * @device: A #GUsbDevice + * @value: (out): #ChPcbErrata, e.g. %CH_PCB_ERRATA_SWAPPED_LEDS + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Gets any PCB errata from the device. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_get_pcb_errata (GUsbDevice *device, ChPcbErrata *value, + GCancellable *cancellable, GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver == 1) { + return ch_device_write_command (device, + CH_CMD_GET_PCB_ERRATA, + NULL, + 0, + NULL, + 0, + cancellable, + error); + } + if (protocol_ver == 2) { + guint8 buf[1]; + gsize actual_length; + gboolean ret; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_GET_PCB_ERRATA, + 0x00, /* wValue */ + CH_USB_INTERFACE, /* idx */ + buf, /* data */ + sizeof(buf), /* length */ + &actual_length, + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* return result */ + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Invalid size, got %li", actual_length); + return FALSE; + } + if (value != NULL) + *value = buf[0]; + return TRUE; + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting the PCB errata is not supported"); + return FALSE; +} + +/** + * ch_device_set_ccd_calibration: + * @device: A #GUsbDevice + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Sets any PCB wavelength_cal on the device + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_set_ccd_calibration (GUsbDevice *device, + gdouble start_nm, + gdouble c0, + gdouble c1, + gdouble c2, + GCancellable *cancellable, + GError **error) +{ + gboolean ret; + gint32 buf[4]; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver != 2) { + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Setting the CCD calibration is not supported"); + return FALSE; + } + + /* format data */ + buf[0] = ch_offset_float_from_double (start_nm); + buf[1] = ch_offset_float_from_double (c0); + buf[2] = ch_offset_float_from_double (c1) * 1000.f; + buf[3] = ch_offset_float_from_double (c2) * 1000.f; + + /* hit hardware */ + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_SET_CCD_CALIBRATION, + 0, /* wValue */ + CH_USB_INTERFACE, /* idx */ + (guint8 *) buf, /* data */ + sizeof(buf), /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* check status */ + return ch_device_check_status (device, cancellable, error); +} + +/** + * ch_device_set_crypto_key: + * @device: A #GUsbDevice + * @keys: a set of XTEA keys + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Sets the firmware signing keys on the device. + * + * IMPORTANT: This can only be called once until the device is unlocked. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_set_crypto_key (GUsbDevice *device, + guint32 keys[4], + GCancellable *cancellable, + GError **error) +{ + gboolean ret; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver != 2) { + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Setting the crypto key is not supported"); + return FALSE; + } + + /* hit hardware */ + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_SET_CRYPTO_KEY, + 0, /* wValue */ + CH_USB_INTERFACE, /* idx */ + (guint8 *) keys, /* data */ + sizeof(guint32) * 4, /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* check status */ + return ch_device_check_status (device, cancellable, error); +} + +/** + * ch_device_get_ccd_calibration: + * @device: A #GUsbDevice + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Gets any PCB wavelength_cal from the device. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_get_ccd_calibration (GUsbDevice *device, + gdouble *start_nm, + gdouble *c0, + gdouble *c1, + gdouble *c2, + GCancellable *cancellable, + GError **error) +{ + gboolean ret; + gint32 buf[4]; + gsize actual_length; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver != 2) { + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting the CCD calibration is not supported"); + return FALSE; + } + + /* hit hardware */ + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_GET_CCD_CALIBRATION, + 0x00, /* wValue */ + CH_USB_INTERFACE, /* idx */ + (guint8 *) buf, /* data */ + sizeof(buf), /* length */ + &actual_length, + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* return result */ + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Invalid size, got %li", actual_length); + return FALSE; + } + if (start_nm != NULL) { + *start_nm = ch_offset_float_to_double (buf[0]); + *c0 = ch_offset_float_to_double (buf[1]); + *c1 = ch_offset_float_to_double (buf[2]) / 1000.f; + *c2 = ch_offset_float_to_double (buf[3]) / 1000.f; + } + + /* check status */ + return ch_device_check_status (device, cancellable, error); +} + +/** + * ch_device_set_integral_time: + * @device: A #GUsbDevice + * @value: integration time in ms + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Sets the integration value for the next sample. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_set_integral_time (GUsbDevice *device, guint16 value, + GCancellable *cancellable, GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver == 1) { + return ch_device_write_command (device, + CH_CMD_SET_INTEGRAL_TIME, + (guint8 *) &value, + sizeof(guint16), + NULL, + 0, + cancellable, + error); + } + if (protocol_ver == 2) { + gboolean ret; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_SET_INTEGRAL_TIME, + value, /* wValue */ + CH_USB_INTERFACE, /* idx */ + NULL, /* data */ + 0, /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + return ret; + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Setting the integral time is not supported"); + return FALSE; +} + +/** + * ch_device_get_integral_time: + * @device: A #GUsbDevice + * @value: (out): integration time in ms + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Gets the integration time used for taking the next samples. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_get_integral_time (GUsbDevice *device, guint16 *value, + GCancellable *cancellable, GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver == 1) { + return ch_device_write_command (device, + CH_CMD_GET_INTEGRAL_TIME, + NULL, + 0, + (guint8 *) value, + sizeof(guint16), + cancellable, + error); + } + if (protocol_ver == 2) { + guint8 buf[2]; + gsize actual_length; + gboolean ret; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_GET_INTEGRAL_TIME, + 0x00, /* wValue */ + CH_USB_INTERFACE, /* idx */ + buf, /* data */ + sizeof(buf), /* length */ + &actual_length, + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* return result */ + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Invalid size, got %li", actual_length); + return FALSE; + } + if (value != NULL) + memcpy (value, buf, sizeof(buf)); + return TRUE; + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting the integral time is not supported"); + return FALSE; +} + +/** + * ch_device_get_temperature: + * @device: A #GUsbDevice + * @value: (out): temperature in Celcius + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Gets the PCB board temperature from the device. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_get_temperature (GUsbDevice *device, gdouble *value, + GCancellable *cancellable, GError **error) +{ + gboolean ret; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver == 1) { + ChPackedFloat pf; + ret = ch_device_write_command (device, + CH_CMD_GET_TEMPERATURE, + NULL, + 0, + (guint8 *) &pf, + sizeof(ChPackedFloat), + cancellable, + error); + if (!ret) + return FALSE; + ch_packed_float_to_double (&pf, value); + return TRUE; + } + if (protocol_ver == 2) { + gint32 buf[1]; + gsize actual_length; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_GET_TEMPERATURE, + 0x00, /* wValue */ + CH_USB_INTERFACE, /* idx */ + (guint8 *) buf, /* data */ + sizeof(buf), /* length */ + &actual_length, + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* return result */ + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Invalid size, got %li", actual_length); + return FALSE; + } + if (value != NULL) + *value = ch_offset_float_to_double (buf[0]); + return TRUE; + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting the temperature is not supported"); + return FALSE; +} + +/** + * ch_device_get_error: + * @device: A #GUsbDevice + * @status: (out): a #ChError, e.g. %CH_ERROR_INVALID_ADDRESS + * @cmd: (out): a #ChCmd, e.g. %CH_CMD_TAKE_READING_SPECTRAL + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Gets the status for the last operation. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_get_error (GUsbDevice *device, ChError *status, ChCmd *cmd, + GCancellable *cancellable, GError **error) +{ + guint8 buf[2]; + gsize actual_length; + gboolean ret; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver != 2) { + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting the last error is not supported"); + return FALSE; + } + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_GET_ERROR, + 0x00, /* wValue */ + CH_USB_INTERFACE, /* idx */ + buf, /* data */ + sizeof(buf), /* length */ + &actual_length, + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* return result */ + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Invalid size, got %li", actual_length); + return FALSE; + } + if (status != NULL) + *status = buf[0]; + if (cmd != NULL) + *cmd = buf[1]; + return TRUE; +} + +/** + * ch_device_open_full: + * @device: A #GUsbDevice + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Opens the device ready for use. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_open_full (GUsbDevice *device, GCancellable *cancellable, GError **error) +{ + gboolean ret; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + /* open */ + if (!g_usb_device_open (device, error)) + return FALSE; + + /* claim interface */ + if (protocol_ver == 1) { + if (!g_usb_device_set_configuration (device, CH_USB_CONFIG, error)) + return FALSE; + if (!g_usb_device_claim_interface (device, + CH_USB_INTERFACE, + G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER, + error)) + return FALSE; + return TRUE; + } + if (protocol_ver == 2) { + if (!g_usb_device_claim_interface (device, CH_USB_INTERFACE, 0, error)) + return FALSE; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_CLEAR_ERROR, + 0x00, /* wValue */ + CH_USB_INTERFACE, /* idx */ + NULL, /* data */ + 0, /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return FALSE; + + /* check status */ + return ch_device_check_status (device, cancellable, error); + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Cannot open this hardware"); + return FALSE; +} + +/** + * ch_device_fixup_error: + **/ +static gboolean +ch_device_fixup_error (GUsbDevice *device, GCancellable *cancellable, GError **error) +{ + ChError status = 0xff; + ChCmd cmd = 0xff; + + /* do we match not supported */ + if (error == NULL) + return FALSE; + if (!g_error_matches (*error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_NOT_SUPPORTED)) + return FALSE; + + /* can we get a error enum from the device */ + if (!ch_device_get_error (device, &status, &cmd, cancellable, NULL)) + return FALSE; + + /* add what we tried to do */ + g_prefix_error (error, + "Failed [%s(%02x):%s(%02x)]: ", + ch_command_to_string (cmd), cmd, + ch_strerror (status), status); + return FALSE; +} + +/** + * ch_device_take_reading_spectral: + * @device: A #GUsbDevice + * @value: a #ChSpectrumKind, e.g. %CH_SPECTRUM_KIND_RAW + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Takes a reading from the device. + * + * Returns: %TRUE for success + * + * Since: 1.3.1 + **/ +gboolean +ch_device_take_reading_spectral (GUsbDevice *device, ChSpectrumKind value, + GCancellable *cancellable, GError **error) +{ + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (protocol_ver == 2) { + gboolean ret; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + 0x51, //FIXME: I have no idea + //CH_CMD_TAKE_READING_SPECTRAL, + value, /* wValue */ + CH_USB_INTERFACE, /* idx */ + NULL, /* data */ + 0, /* length */ + NULL, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return ch_device_fixup_error (device, cancellable, error); + + /* check status */ + return ch_device_check_status (device, cancellable, error); + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Taking spectral data is not supported"); + return FALSE; +} + +/** + * ch_device_take_reading_xyz: + * @device: A #GUsbDevice + * @calibration_idx: A calibration index or 0 for none + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Takes a reading from the device and returns the XYZ value. + * + * Returns: a #CdColorXYZ, or %NULL for error + * + * Since: 1.3.1 + **/ +CdColorXYZ * +ch_device_take_reading_xyz (GUsbDevice *device, guint16 calibration_idx, + GCancellable *cancellable, GError **error) +{ + CdColorXYZ *value; + gboolean ret; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + + g_return_val_if_fail (G_USB_DEVICE (device), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + if (protocol_ver == 1) { + ChPackedFloat pf[3]; + ret = ch_device_write_command (device, + CH_CMD_GET_TEMPERATURE, + (guint8 *) &calibration_idx, + sizeof(guint16), + (guint8 *) pf, + sizeof(pf), + cancellable, + error); + if (!ret) + return NULL; + + /* parse */ + value = cd_color_xyz_new (); + ch_packed_float_to_double (&pf[0], &value->X); + ch_packed_float_to_double (&pf[1], &value->Y); + ch_packed_float_to_double (&pf[2], &value->Z); + return value; + } + if (protocol_ver == 2) { + gsize actual_length; + gint32 buf[3]; + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_TAKE_READING_XYZ, + 0, /* wValue */ + CH_USB_INTERFACE, /* idx */ + (guint8 *) buf, /* data */ + sizeof(buf), /* length */ + &actual_length, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return NULL; + + /* return result */ + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Invalid size, got %li", actual_length); + return NULL; + } + + /* check status */ + if (!ch_device_check_status (device, cancellable, error)) + return NULL; + + /* parse */ + value = cd_color_xyz_new (); + value->X = ch_offset_float_to_double (buf[0]); + value->Y= ch_offset_float_to_double (buf[1]); + value->Z = ch_offset_float_to_double (buf[2]); + return value; + } + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting an XYZ value is not supported"); + return NULL; +} + +/** + * ch_device_get_spectrum: + * @device: A #GUsbDevice + * @cancellable: a #GCancellable, or %NULL + * @error: a #GError, or %NULL + * + * Gets the spectrum from the device. This queries the device multiple times + * until the spectrum has been populated. + * + * The spectrum is also set up with the correct start and wavelength + * calibration coefficients. + * + * Returns: a #CdSpectrum, or %NULL for error + * + * Since: 1.3.1 + **/ +CdSpectrum * +ch_device_get_spectrum (GUsbDevice *device, GCancellable *cancellable, GError **error) +{ + gboolean ret; + gdouble cal[4]; + gint32 buf[CH_EP0_TRANSFER_SIZE / sizeof(gint32)]; + gsize actual_length; + guint16 i; + guint16 j; + guint8 protocol_ver = ch_device_get_protocol_ver (device); + g_autoptr(CdSpectrum) sp = NULL; + + g_return_val_if_fail (G_USB_DEVICE (device), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + /* populate ahead of time for each chunk */ + sp = cd_spectrum_new (); + + if (protocol_ver != 2) { + g_set_error_literal (error, + CH_DEVICE_ERROR, + CH_ERROR_NOT_IMPLEMENTED, + "Getting a spectrum is not supported"); + return NULL; + } + for (i = 0; i < 1024 * sizeof(gint32) / CH_EP0_TRANSFER_SIZE; i++) { + ret = g_usb_device_control_transfer (device, + G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, + G_USB_DEVICE_REQUEST_TYPE_CLASS, + G_USB_DEVICE_RECIPIENT_INTERFACE, + CH_CMD_READ_SRAM, + i, /* wValue */ + CH_USB_INTERFACE, /* idx */ + (guint8 *) buf, /* data */ + sizeof(buf), /* length */ + &actual_length, /* actual_length */ + CH_DEVICE_USB_TIMEOUT, + cancellable, + error); + if (!ret) + return NULL; + if (actual_length != sizeof(buf)) { + g_set_error (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_IO, + "Failed to get spectrum data, got %li", + actual_length); + return NULL; + } + + /* add data */ + for (j = 0; j < CH_EP0_TRANSFER_SIZE / sizeof(gint32); j++) { + gdouble tmp = ch_offset_float_to_double (buf[j]); + cd_spectrum_add_value (sp, tmp); + } + } + + /* check status */ + if (!ch_device_check_status (device, cancellable, error)) + return NULL; + + /* add the coefficients */ + if (!ch_device_get_ccd_calibration (device, + &cal[0], &cal[1], &cal[2], &cal[3], + cancellable, error)) + return NULL; + cd_spectrum_set_start (sp, cal[0]); + cd_spectrum_set_wavelength_cal (sp, cal[1], cal[2], cal[3]); + + /* return copy */ + return cd_spectrum_dup (sp); +} diff -Nru colord-1.2.12/lib/colorhug/ch-device.h colord-1.3.2/lib/colorhug/ch-device.h --- colord-1.2.12/lib/colorhug/ch-device.h 2015-05-28 07:44:26.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-device.h 2016-02-17 13:41:32.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2011-2012 Richard Hughes + * Copyright (C) 2011-2016 Richard Hughes * * Licensed under the GNU General Public License Version 2 * @@ -28,6 +28,7 @@ #include #include +#include #include "ch-common.h" @@ -74,6 +75,92 @@ guint16 ch_device_get_runcode_address (GUsbDevice *device); const gchar *ch_device_get_guid (GUsbDevice *device); + +// FIXME: add to spec +typedef enum { + CH_SPECTRUM_KIND_RAW = 0x00, + CH_SPECTRUM_KIND_DARK_CAL = 0x01, + CH_SPECTRUM_KIND_TEMP_CAL = 0x02, + CH_SPECTRUM_KIND_LAST +} ChSpectrumKind; + +gboolean ch_device_open_full (GUsbDevice *device, + GCancellable *cancellable, + GError **error); +gboolean ch_device_self_test (GUsbDevice *device, + GCancellable *cancellable, + GError **error); +gboolean ch_device_set_serial_number (GUsbDevice *device, + guint32 value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_get_serial_number (GUsbDevice *device, + guint32 *value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_set_leds (GUsbDevice *device, + ChStatusLed value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_get_leds (GUsbDevice *device, + ChStatusLed *value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_set_pcb_errata (GUsbDevice *device, + ChPcbErrata value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_get_pcb_errata (GUsbDevice *device, + ChPcbErrata *value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_set_ccd_calibration (GUsbDevice *device, + gdouble nm_start, + gdouble c0, + gdouble c1, + gdouble c2, + GCancellable *cancellable, + GError **error); +gboolean ch_device_set_crypto_key (GUsbDevice *device, + guint32 keys[4], + GCancellable *cancellable, + GError **error); +gboolean ch_device_get_ccd_calibration (GUsbDevice *device, + gdouble *nm_start, + gdouble *c0, + gdouble *c1, + gdouble *c2, + GCancellable *cancellable, + GError **error); +gboolean ch_device_set_integral_time (GUsbDevice *device, + guint16 value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_get_integral_time (GUsbDevice *device, + guint16 *value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_get_temperature (GUsbDevice *device, + gdouble *value, + GCancellable *cancellable, + GError **error); +gboolean ch_device_get_error (GUsbDevice *device, + ChError *status, + ChCmd *cmd, + GCancellable *cancellable, + GError **error); +gboolean ch_device_take_reading_spectral(GUsbDevice *device, + ChSpectrumKind value, + GCancellable *cancellable, + GError **error); +CdColorXYZ *ch_device_take_reading_xyz (GUsbDevice *device, + guint16 calibration_idx, + GCancellable *cancellable, + GError **error); +CdSpectrum *ch_device_get_spectrum (GUsbDevice *device, + GCancellable *cancellable, + GError **error); + G_END_DECLS #endif diff -Nru colord-1.2.12/lib/colorhug/ch-device-queue.c colord-1.3.2/lib/colorhug/ch-device-queue.c --- colord-1.2.12/lib/colorhug/ch-device-queue.c 2015-07-06 14:31:52.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-device-queue.c 2016-01-04 14:49:35.000000000 +0000 @@ -27,8 +27,6 @@ #include #include -#include "cd-cleanup.h" - #include "ch-common.h" #include "ch-device.h" #include "ch-device-queue.h" @@ -36,18 +34,18 @@ static void ch_device_queue_finalize (GObject *object); -#define CH_DEVICE_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CH_TYPE_DEVICE_QUEUE, ChDeviceQueuePrivate)) +#define GET_PRIVATE(o) (ch_device_queue_get_instance_private (o)) /** * ChDeviceQueuePrivate: * * Private #ChDeviceQueue data **/ -struct _ChDeviceQueuePrivate +typedef struct { GPtrArray *data_array; GHashTable *devices_in_use; -}; +} ChDeviceQueuePrivate; enum { SIGNAL_DEVICE_FAILED, @@ -55,7 +53,7 @@ SIGNAL_LAST }; -G_DEFINE_TYPE (ChDeviceQueue, ch_device_queue, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (ChDeviceQueue, ch_device_queue, G_TYPE_OBJECT) typedef gboolean (*ChDeviceQueueParseFunc) (guint8 *output_buffer, gsize output_buffer_size, @@ -90,11 +88,11 @@ GCancellable *cancellable; GSimpleAsyncResult *res; GPtrArray *failures; -} ChDeviceQueueHelper; +} ChDeviceQueueTaskData; static guint signals[SIGNAL_LAST] = { 0 }; -static gboolean ch_device_queue_process_data (ChDeviceQueueHelper *helper, ChDeviceQueueData *data); +static gboolean ch_device_queue_process_data (GTask *task, ChDeviceQueueData *data); /** * ch_device_queue_data_free: @@ -112,17 +110,14 @@ } /** - * ch_device_queue_free_helper: + * ch_device_queue_task_data_free: **/ static void -ch_device_queue_free_helper (ChDeviceQueueHelper *helper) +ch_device_queue_task_data_free (ChDeviceQueueTaskData *data) { - if (helper->cancellable != NULL) - g_object_unref (helper->cancellable); - g_object_unref (helper->device_queue); - g_object_unref (helper->res); - g_ptr_array_unref (helper->failures); - g_free (helper); + g_object_unref (data->device_queue); + g_ptr_array_unref (data->failures); + g_free (data); } /** @@ -131,6 +126,7 @@ static void ch_device_queue_device_force_complete (ChDeviceQueue *device_queue, GUsbDevice *device) { + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); ChDeviceQueueData *data; const gchar *device_id; const gchar *device_id_tmp; @@ -138,8 +134,8 @@ /* go through the list of commands and cancel them all */ device_id = g_usb_device_get_platform_id (device); - for (i = 0; i < device_queue->priv->data_array->len; i++) { - data = g_ptr_array_index (device_queue->priv->data_array, i); + for (i = 0; i < priv->data_array->len; i++) { + data = g_ptr_array_index (priv->data_array, i); device_id_tmp = g_usb_device_get_platform_id (data->device); if (g_strcmp0 (device_id_tmp, device_id) == 0) data->state = CH_DEVICE_QUEUE_DATA_STATE_CANCELLED; @@ -152,25 +148,26 @@ static void ch_device_queue_update_progress (ChDeviceQueue *device_queue) { + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); guint complete = 0; guint i; guint percentage; ChDeviceQueueData *data; /* no devices */ - if (device_queue->priv->data_array->len == 0) + if (priv->data_array->len == 0) return; /* find out how many commands are complete */ - for (i = 0; i < device_queue->priv->data_array->len; i++) { - data = g_ptr_array_index (device_queue->priv->data_array, i); + for (i = 0; i < priv->data_array->len; i++) { + data = g_ptr_array_index (priv->data_array, i); if (data->state == CH_DEVICE_QUEUE_DATA_STATE_COMPLETE || data->state == CH_DEVICE_QUEUE_DATA_STATE_CANCELLED) complete++; } /* emit a signal with our progress */ - percentage = (complete * 100) / device_queue->priv->data_array->len; + percentage = (complete * 100) / priv->data_array->len; g_signal_emit (device_queue, signals[SIGNAL_PROGRESS_CHANGED], 0, percentage); @@ -183,13 +180,14 @@ ch_device_queue_count_in_state (ChDeviceQueue *device_queue, ChDeviceQueueDataState state) { + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); guint i; guint cnt = 0; ChDeviceQueueData *data; /* find any data objects in a specific state */ - for (i = 0; i < device_queue->priv->data_array->len; i++) { - data = g_ptr_array_index (device_queue->priv->data_array, i); + for (i = 0; i < priv->data_array->len; i++) { + data = g_ptr_array_index (priv->data_array, i); if (data->state == state) cnt++; } @@ -205,23 +203,24 @@ gpointer user_data) { ChDeviceQueueData *data; - ChDeviceQueueHelper *helper = (ChDeviceQueueHelper *) user_data; + GTask *task = G_TASK (user_data); + ChDeviceQueueTaskData *tdata = g_task_get_task_data (task); + ChDeviceQueue *device_queue = CH_DEVICE_QUEUE (tdata->device_queue); + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); const gchar *device_id; const gchar *tmp; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; guint i; guint pending_commands; ChError last_error_code = 0; GUsbDevice *device = G_USB_DEVICE (source); - _cleanup_free_ gchar *error_msg = NULL; + g_autofree gchar *error_msg = NULL; /* mark it as not in use */ device_id = g_usb_device_get_platform_id (device); - data = g_hash_table_lookup (helper->device_queue->priv->devices_in_use, - device_id); - g_hash_table_remove (helper->device_queue->priv->devices_in_use, - device_id); + data = g_hash_table_lookup (priv->devices_in_use, device_id); + g_hash_table_remove (priv->devices_in_use, device_id); /* get data */ ret = ch_device_write_command_finish (device, res, &error); @@ -235,74 +234,77 @@ if (!ret) { /* tell the client the device has failed */ g_debug ("emit device-failed: %s", error->message); - g_signal_emit (helper->device_queue, + g_signal_emit (device_queue, signals[SIGNAL_DEVICE_FAILED], 0, device, error->message); /* save this so we can possibly use when we're done */ last_error_code = error->code; - g_ptr_array_add (helper->failures, + g_ptr_array_add (tdata->failures, g_strdup_printf ("%s: %s", g_usb_device_get_platform_id (device), error->message)); - g_error_free (error); /* should we mark complete other commands as complete */ - if ((helper->process_flags & CH_DEVICE_QUEUE_PROCESS_FLAGS_CONTINUE_ERRORS) == 0) { - ch_device_queue_device_force_complete (helper->device_queue, device); - ch_device_queue_update_progress (helper->device_queue); + if ((tdata->process_flags & CH_DEVICE_QUEUE_PROCESS_FLAGS_CONTINUE_ERRORS) == 0) { + ch_device_queue_device_force_complete (device_queue, device); + ch_device_queue_update_progress (device_queue); goto out; } } /* update progress */ data->state = CH_DEVICE_QUEUE_DATA_STATE_COMPLETE; - ch_device_queue_update_progress (helper->device_queue); + ch_device_queue_update_progress (device_queue); /* is there another pending command for this device */ - for (i = 0; i < helper->device_queue->priv->data_array->len; i++) { - data = g_ptr_array_index (helper->device_queue->priv->data_array, i); - ret = ch_device_queue_process_data (helper, data); + for (i = 0; i < priv->data_array->len; i++) { + data = g_ptr_array_index (priv->data_array, i); + ret = ch_device_queue_process_data (task, data); if (ret) break; } out: /* any more pending commands? */ - pending_commands = ch_device_queue_count_in_state (helper->device_queue, + pending_commands = ch_device_queue_count_in_state (device_queue, CH_DEVICE_QUEUE_DATA_STATE_PENDING); - pending_commands += ch_device_queue_count_in_state (helper->device_queue, + pending_commands += ch_device_queue_count_in_state (device_queue, CH_DEVICE_QUEUE_DATA_STATE_WAITING_FOR_HW); g_debug ("Pending commands: %i", pending_commands); if (pending_commands == 0) { /* should we return the process with an error, or just * rely on the signal? */ - if (helper->failures->len == 1 && - (helper->process_flags & CH_DEVICE_QUEUE_PROCESS_FLAGS_NONFATAL_ERRORS) == 0) { - tmp = g_ptr_array_index (helper->failures, 0); - g_simple_async_result_set_error (helper->res, - CH_DEVICE_ERROR, - last_error_code, - "%s", tmp); - } else if (helper->failures->len > 1 && - (helper->process_flags & CH_DEVICE_QUEUE_PROCESS_FLAGS_NONFATAL_ERRORS) == 0) { - g_ptr_array_add (helper->failures, NULL); - error_msg = g_strjoinv (", ", (gchar**) helper->failures->pdata); - g_simple_async_result_set_error (helper->res, - CH_DEVICE_ERROR, - last_error_code, - "There were %i failures: %s", - helper->failures->len - 1, - error_msg); + if (tdata->failures->len == 1 && + (tdata->process_flags & CH_DEVICE_QUEUE_PROCESS_FLAGS_NONFATAL_ERRORS) == 0) { + tmp = g_ptr_array_index (tdata->failures, 0); + g_task_return_new_error (task, + CH_DEVICE_ERROR, + last_error_code, + "%s", tmp); + } else if (tdata->failures->len > 1 && + (tdata->process_flags & CH_DEVICE_QUEUE_PROCESS_FLAGS_NONFATAL_ERRORS) == 0) { + g_ptr_array_add (tdata->failures, NULL); + error_msg = g_strjoinv (", ", (gchar**) tdata->failures->pdata); + g_task_return_new_error (task, + CH_DEVICE_ERROR, + last_error_code, + "There were %i failures: %s", + tdata->failures->len - 1, + error_msg); } else { - g_simple_async_result_set_op_res_gboolean (helper->res, TRUE); + g_task_return_boolean (task, TRUE); } /* remove all commands from the queue, as they are done */ - g_ptr_array_set_size (helper->device_queue->priv->data_array, 0); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_queue_free_helper (helper); +#if 0 +/* FIXME: some sort of race uncovered in the port to GTask means that we try + * to remove data objects before they are marked complete; for now disable */ + + g_ptr_array_set_size (priv->data_array, 0); +#endif + g_object_unref (task); } } @@ -312,9 +314,10 @@ * Returns TRUE if the command was submitted **/ static gboolean -ch_device_queue_process_data (ChDeviceQueueHelper *helper, - ChDeviceQueueData *data) +ch_device_queue_process_data (GTask *task, ChDeviceQueueData *data) { + ChDeviceQueue *device_queue = CH_DEVICE_QUEUE (g_task_get_source_object (task)); + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); ChDeviceQueueData *data_tmp; const gchar *device_id; @@ -324,8 +327,7 @@ /* is this device already busy? */ device_id = g_usb_device_get_platform_id (data->device); - data_tmp = g_hash_table_lookup (helper->device_queue->priv->devices_in_use, - device_id); + data_tmp = g_hash_table_lookup (priv->devices_in_use, device_id); if (data_tmp != NULL) return FALSE; @@ -336,13 +338,11 @@ data->buffer_in_len, data->buffer_out, data->buffer_out_len, - helper->cancellable, + g_task_get_cancellable (task), ch_device_queue_process_write_command_cb, - helper); + task); /* mark this as in use */ - g_hash_table_insert (helper->device_queue->priv->devices_in_use, - g_strdup (device_id), - data); + g_hash_table_insert (priv->devices_in_use, g_strdup (device_id), data); /* remove this from the command queue -- TODO: retries? */ data->state = CH_DEVICE_QUEUE_DATA_STATE_WAITING_FOR_HW; @@ -367,36 +367,33 @@ GAsyncReadyCallback callback, gpointer user_data) { - ChDeviceQueueHelper *helper; + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); + ChDeviceQueueTaskData *tdata; ChDeviceQueueData *data; + GTask *task = NULL; guint i; g_return_if_fail (CH_IS_DEVICE_QUEUE (device_queue)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - helper = g_new0 (ChDeviceQueueHelper, 1); - helper->process_flags = process_flags; - helper->failures = g_ptr_array_new_with_free_func (g_free); - helper->device_queue = g_object_ref (device_queue); - helper->res = g_simple_async_result_new (G_OBJECT (device_queue), - callback, - user_data, - ch_device_queue_process_async); - if (cancellable != NULL) - helper->cancellable = g_object_ref (cancellable); + task = g_task_new (device_queue, cancellable, callback, user_data); + tdata = g_new0 (ChDeviceQueueTaskData, 1); + tdata->process_flags = process_flags; + tdata->device_queue = g_object_ref (device_queue); + tdata->failures = g_ptr_array_new_with_free_func (g_free); + g_task_set_task_data (task, tdata, (GDestroyNotify) ch_device_queue_task_data_free); /* go through the list of commands and try to submit them all */ - ch_device_queue_update_progress (helper->device_queue); - for (i = 0; i < device_queue->priv->data_array->len; i++) { - data = g_ptr_array_index (device_queue->priv->data_array, i); - ch_device_queue_process_data (helper, data); + ch_device_queue_update_progress (device_queue); + for (i = 0; i < priv->data_array->len; i++) { + data = g_ptr_array_index (priv->data_array, i); + ch_device_queue_process_data (task, data); } /* is anything pending? */ - if (g_hash_table_size (device_queue->priv->devices_in_use) == 0) { - g_simple_async_result_set_op_res_gboolean (helper->res, TRUE); - g_simple_async_result_complete_in_idle (helper->res); - ch_device_queue_free_helper (helper); + if (g_hash_table_size (priv->devices_in_use) == 0) { + g_task_return_boolean (task, TRUE); + g_object_unref (task); } } @@ -417,17 +414,8 @@ GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CH_DEVICE_QUEUE (device_queue), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - return g_simple_async_result_get_op_res_gboolean (simple); + g_return_val_if_fail (g_task_is_valid (res, device_queue), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } /**********************************************************************/ @@ -516,6 +504,7 @@ GDestroyNotify user_data_destroy_func) { ChDeviceQueueData *data; + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); g_return_if_fail (CH_IS_DEVICE_QUEUE (device_queue)); g_return_if_fail (G_USB_IS_DEVICE (device)); @@ -533,7 +522,7 @@ data->buffer_out = buffer_out; data->buffer_out_len = buffer_out_len; data->buffer_out_destroy_func = buffer_out_destroy_func; - g_ptr_array_add (device_queue->priv->data_array, data); + g_ptr_array_add (priv->data_array, data); } /** @@ -3244,8 +3233,6 @@ G_STRUCT_OFFSET (ChDeviceQueueClass, progress_changed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_UINT); - - g_type_class_add_private (klass, sizeof (ChDeviceQueuePrivate)); } /** @@ -3254,9 +3241,9 @@ static void ch_device_queue_init (ChDeviceQueue *device_queue) { - device_queue->priv = CH_DEVICE_QUEUE_GET_PRIVATE (device_queue); - device_queue->priv->data_array = g_ptr_array_new_with_free_func ((GDestroyNotify) ch_device_queue_data_free); - device_queue->priv->devices_in_use = g_hash_table_new_full (g_str_hash, + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); + priv->data_array = g_ptr_array_new_with_free_func ((GDestroyNotify) ch_device_queue_data_free); + priv->devices_in_use = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); @@ -3269,7 +3256,7 @@ ch_device_queue_finalize (GObject *object) { ChDeviceQueue *device_queue = CH_DEVICE_QUEUE (object); - ChDeviceQueuePrivate *priv = device_queue->priv; + ChDeviceQueuePrivate *priv = GET_PRIVATE (device_queue); g_ptr_array_unref (priv->data_array); g_hash_table_unref (priv->devices_in_use); diff -Nru colord-1.2.12/lib/colorhug/ch-device-queue.h colord-1.3.2/lib/colorhug/ch-device-queue.h --- colord-1.2.12/lib/colorhug/ch-device-queue.h 2015-07-06 14:31:52.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-device-queue.h 2015-10-13 15:24:13.000000000 +0000 @@ -35,20 +35,8 @@ G_BEGIN_DECLS -#define CH_TYPE_DEVICE_QUEUE (ch_device_queue_get_type ()) -#define CH_DEVICE_QUEUE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CH_TYPE_DEVICE_QUEUE, ChDeviceQueue)) -#define CH_DEVICE_QUEUE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CH_TYPE_DEVICE_QUEUE, ChDeviceQueueClass)) -#define CH_IS_DEVICE_QUEUE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CH_TYPE_DEVICE_QUEUE)) - -typedef struct _ChDeviceQueuePrivate ChDeviceQueuePrivate; -typedef struct _ChDeviceQueue ChDeviceQueue; -typedef struct _ChDeviceQueueClass ChDeviceQueueClass; - -struct _ChDeviceQueue -{ - GObject parent; - ChDeviceQueuePrivate *priv; -}; +#define CH_TYPE_DEVICE_QUEUE (ch_device_queue_get_type ()) +G_DECLARE_DERIVABLE_TYPE (ChDeviceQueue, ch_device_queue, CH, DEVICE_QUEUE, GObject) struct _ChDeviceQueueClass { @@ -96,7 +84,6 @@ CH_DEVICE_QUEUE_PROCESS_FLAGS_NONFATAL_ERRORS = 1 << 1 } ChDeviceQueueProcessFlags; -GType ch_device_queue_get_type (void); ChDeviceQueue *ch_device_queue_new (void); void ch_device_queue_add (ChDeviceQueue *device_queue, diff -Nru colord-1.2.12/lib/colorhug/ch-inhx32.c colord-1.3.2/lib/colorhug/ch-inhx32.c --- colord-1.2.12/lib/colorhug/ch-inhx32.c 2015-07-06 14:31:52.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-inhx32.c 2015-10-13 15:24:13.000000000 +0000 @@ -25,8 +25,6 @@ #include #include -#include "cd-cleanup.h" - #include "ch-inhx32.h" #define CH_RECORD_TYPE_DATA 0 @@ -82,7 +80,7 @@ guint j; guint len_tmp; guint type; - _cleanup_string_free_ GString *string = NULL; + g_autoptr(GString) string = NULL; g_return_val_if_fail (in_buffer != NULL, FALSE); g_return_val_if_fail (runcode_addr > 0, FALSE); diff -Nru colord-1.2.12/lib/colorhug/ch-self-test.c colord-1.3.2/lib/colorhug/ch-self-test.c --- colord-1.2.12/lib/colorhug/ch-self-test.c 2015-05-28 07:44:26.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-self-test.c 2015-10-13 15:42:03.000000000 +0000 @@ -39,7 +39,7 @@ ChSha1 sha1; gboolean ret; gchar *str; - GError *error = NULL; + g_autoptr(GError) error = NULL; /* parse into structure */ ret = ch_sha1_parse ("f18973b4ebaeab527dc15d5dd246debfbff20324", @@ -85,7 +85,7 @@ { ChDeviceQueue *device_queue; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GPtrArray *devices; guint i; guint valid_devices = 0; @@ -205,7 +205,6 @@ g_assert_error (error, 1, 0); g_debug ("error was: %s", error->message); g_assert (!ret); - g_error_free (error); out: g_ptr_array_unref (devices); g_object_unref (device_queue); @@ -489,7 +488,7 @@ ChFreqScale multiplier = 0; gboolean ret; gdouble elapsed; - GError *error = NULL; + g_autoptr(GError) error = NULL; GTimer *timer; guint16 integral_time = 0; guint8 leds = 0; @@ -502,7 +501,6 @@ G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_NO_DEVICE)) { g_debug ("no device, skipping tests"); - g_error_free (error); return; } g_assert_no_error (error); @@ -654,7 +652,7 @@ ch_test_eeprom_func (void) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; guint16 major = 0; guint16 micro = 0; guint16 minor = 0; @@ -684,7 +682,6 @@ G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_NO_DEVICE)) { g_debug ("no device, skipping tests"); - g_error_free (error); return; } g_assert_no_error (error); @@ -928,7 +925,7 @@ ch_test_reading_func (void) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; guint32 take_reading = 0; GUsbDevice *device; ChDeviceQueue *device_queue; @@ -939,7 +936,6 @@ G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_NO_DEVICE)) { g_debug ("no device, skipping tests"); - g_error_free (error); return; } g_assert_no_error (error); @@ -1002,7 +998,7 @@ CdColorXYZ reading1; CdColorXYZ reading2; gdouble scaling_factor_actual; - GError *error = NULL; + g_autoptr(GError) error = NULL; guint16 calibration_map[6]; guint16 post_scale; guint i; @@ -1023,7 +1019,6 @@ G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_NO_DEVICE)) { g_debug ("no device, skipping tests"); - g_error_free (error); return; } g_assert_no_error (error); @@ -1153,7 +1148,7 @@ ch_test_incomplete_request_func (void) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; guint8 buffer[CH_USB_HID_EP_SIZE]; GUsbDevice *device = NULL; @@ -1171,7 +1166,6 @@ G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_NO_DEVICE)) { g_debug ("no device, skipping tests"); - g_error_free (error); return; } g_assert_no_error (error); @@ -1190,7 +1184,6 @@ &error); if (!ret) { g_warning ("Error: %s", error->message); - g_error_free (error); goto out; } @@ -1210,7 +1203,6 @@ &error); if (!ret) { g_warning ("Error: %s", error->message); - g_error_free (error); goto out; } @@ -1226,7 +1218,6 @@ &error); if (!ret) { g_warning ("Error: %s", error->message); - g_error_free (error); goto out; } g_assert_cmpint (buffer[0], ==, CH_ERROR_INCOMPLETE_REQUEST); diff -Nru colord-1.2.12/lib/colorhug/ch-version.h colord-1.3.2/lib/colorhug/ch-version.h --- colord-1.2.12/lib/colorhug/ch-version.h 2015-07-20 09:49:03.000000000 +0000 +++ colord-1.3.2/lib/colorhug/ch-version.h 2016-02-17 13:32:58.000000000 +0000 @@ -29,8 +29,8 @@ /* compile time version */ #define CH_MAJOR_VERSION (1) -#define CH_MINOR_VERSION (2) -#define CH_MICRO_VERSION (12) +#define CH_MINOR_VERSION (3) +#define CH_MICRO_VERSION (2) /* check whether a Ch version equal to or greater than * major.minor.micro. diff -Nru colord-1.2.12/lib/colorhug/Makefile.in colord-1.3.2/lib/colorhug/Makefile.in --- colord-1.2.12/lib/colorhug/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/lib/colorhug/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -528,6 +528,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -632,6 +633,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/lib/compat/cd-compat-edid.c colord-1.3.2/lib/compat/cd-compat-edid.c --- colord-1.2.12/lib/compat/cd-compat-edid.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/compat/cd-compat-edid.c 2015-10-13 15:24:13.000000000 +0000 @@ -33,7 +33,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-compat-edid.h" /** @@ -56,12 +55,12 @@ char *profile_fn) { gboolean ret; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *md5 = NULL; - _cleanup_object_unref_ CdClient *client = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *md5 = NULL; + g_autoptr(CdClient) client = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; + g_autoptr(GFile) file = NULL; g_return_val_if_fail (profile_fn != NULL, CD_EDID_ERROR_RESOURCE); @@ -192,12 +191,12 @@ char *profile_fn) { gboolean ret; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *md5 = NULL; - _cleanup_object_unref_ CdClient *client = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *md5 = NULL; + g_autoptr(CdClient) client = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; + g_autoptr(GFile) file = NULL; g_return_val_if_fail (profile_fn != NULL, CD_EDID_ERROR_RESOURCE); @@ -289,11 +288,11 @@ { const gchar *filename; gboolean ret; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *md5 = NULL; - _cleanup_object_unref_ CdClient *client = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *md5 = NULL; + g_autoptr(CdClient) client = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; /* bad input */ if (edid == NULL || edid_len == 0) diff -Nru colord-1.2.12/lib/compat/Makefile.in colord-1.3.2/lib/compat/Makefile.in --- colord-1.2.12/lib/compat/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/lib/compat/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -329,6 +329,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -433,6 +434,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/lib/dtp94/Makefile.in colord-1.3.2/lib/dtp94/Makefile.in --- colord-1.2.12/lib/dtp94/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/lib/dtp94/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -327,6 +327,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -431,6 +432,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/lib/huey/huey-ctx.c colord-1.3.2/lib/huey/huey-ctx.c --- colord-1.2.12/lib/huey/huey-ctx.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/lib/huey/huey-ctx.c 2016-03-03 09:37:25.000000000 +0000 @@ -33,7 +33,7 @@ static void huey_ctx_init (HueyCtx *ctx); static void huey_ctx_finalize (GObject *object); -#define HUEY_CTX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), HUEY_TYPE_CTX, HueyCtxPrivate)) +#define GET_PRIVATE(o) (huey_ctx_get_instance_private (o)) #define HUEY_CONTROL_MESSAGE_TIMEOUT 50000 /* ms */ #define HUEY_MAX_READ_RETRIES 5 @@ -56,7 +56,7 @@ * * Private #HueyCtx data **/ -struct _HueyCtxPrivate +typedef struct { CdMat3x3 calibration_crt; CdMat3x3 calibration_lcd; @@ -64,7 +64,7 @@ gchar *unlock_string; gfloat calibration_value; GUsbDevice *device; -}; +} HueyCtxPrivate; enum { PROP_0, @@ -72,7 +72,7 @@ PROP_LAST }; -G_DEFINE_TYPE (HueyCtx, huey_ctx, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (HueyCtx, huey_ctx, G_TYPE_OBJECT) /** * huey_ctx_error_quark: @@ -100,8 +100,9 @@ GUsbDevice * huey_ctx_get_device (HueyCtx *ctx) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_val_if_fail (HUEY_IS_CTX (ctx), NULL); - return ctx->priv->device; + return priv->device; } /** @@ -112,8 +113,9 @@ void huey_ctx_set_device (HueyCtx *ctx, GUsbDevice *device) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_if_fail (HUEY_IS_CTX (ctx)); - ctx->priv->device = g_object_ref (device); + priv->device = g_object_ref (device); } /** @@ -125,7 +127,7 @@ huey_ctx_setup (HueyCtx *ctx, GError **error) { gboolean ret; - HueyCtxPrivate *priv = ctx->priv; + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_val_if_fail (HUEY_IS_CTX (ctx), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -178,8 +180,9 @@ const CdMat3x3 * huey_ctx_get_calibration_lcd (HueyCtx *ctx) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_val_if_fail (HUEY_IS_CTX (ctx), NULL); - return &ctx->priv->calibration_lcd; + return &priv->calibration_lcd; } /** @@ -190,8 +193,9 @@ const CdMat3x3 * huey_ctx_get_calibration_crt (HueyCtx *ctx) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_val_if_fail (HUEY_IS_CTX (ctx), NULL); - return &ctx->priv->calibration_crt; + return &priv->calibration_crt; } /** @@ -202,8 +206,9 @@ gfloat huey_ctx_get_calibration_value (HueyCtx *ctx) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_val_if_fail (HUEY_IS_CTX (ctx), -1); - return ctx->priv->calibration_value; + return priv->calibration_value; } /** @@ -214,8 +219,9 @@ const CdVec3 * huey_ctx_get_dark_offset (HueyCtx *ctx) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_val_if_fail (HUEY_IS_CTX (ctx), NULL); - return &ctx->priv->dark_offset; + return &priv->dark_offset; } /** @@ -226,8 +232,9 @@ const gchar * huey_ctx_get_unlock_string (HueyCtx *ctx) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_val_if_fail (HUEY_IS_CTX (ctx), NULL); - return ctx->priv->unlock_string; + return priv->unlock_string; } typedef struct { @@ -248,6 +255,7 @@ HueyCtxDeviceRaw *raw, GError **error) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); guint8 request[] = { HUEY_CMD_SENSOR_MEASURE_RGB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; guint8 reply[8]; @@ -260,7 +268,7 @@ cd_buffer_write_uint16_be (request + 5, threshold->B); /* measure, and get red */ - ret = huey_device_send_data (ctx->priv->device, + ret = huey_device_send_data (priv->device, request, 8, reply, 8, &reply_read, @@ -273,7 +281,7 @@ /* get green */ request[0] = HUEY_CMD_READ_GREEN; - ret = huey_device_send_data (ctx->priv->device, + ret = huey_device_send_data (priv->device, request, 8, reply, 8, &reply_read, @@ -286,7 +294,7 @@ /* get blue */ request[0] = HUEY_CMD_READ_BLUE; - ret = huey_device_send_data (ctx->priv->device, + ret = huey_device_send_data (priv->device, request, 8, reply, 8, &reply_read, @@ -334,6 +342,7 @@ CdColorXYZ * huey_ctx_take_sample (HueyCtx *ctx, CdSensorCap cap, GError **error) { + HueyCtxPrivate *priv = GET_PRIVATE (ctx); CdColorRGB values; CdColorXYZ color_result; CdMat3x3 *device_calibration; @@ -351,7 +360,7 @@ HUEY_CTX_ERROR, HUEY_CTX_ERROR_NO_SUPPORT, "Huey cannot measure in projector mode"); - return FALSE; + return NULL; } /* set this to one value for a quick approximate value */ @@ -363,7 +372,7 @@ &color_native, error); if (!ret) - return FALSE; + return NULL; g_debug ("initial values: red=%i, green=%i, blue=%i", color_native.R, color_native.G, color_native.B); @@ -386,7 +395,7 @@ &color_native, error); if (!ret) - return FALSE; + return NULL; g_debug ("raw values: red=%i, green=%i, blue=%i", color_native.R, color_native.G, color_native.B); @@ -400,7 +409,7 @@ /* remove dark offset */ temp = (CdVec3*) &values; cd_vec3_subtract (temp, - &ctx->priv->dark_offset, + &priv->dark_offset, temp); g_debug ("dark offset values: red=%0.6lf, green=%0.6lf, blue=%0.6lf", @@ -419,11 +428,11 @@ case CD_SENSOR_CAP_CRT: case CD_SENSOR_CAP_PLASMA: g_debug ("using CRT calibration matrix"); - device_calibration = &ctx->priv->calibration_crt; + device_calibration = &priv->calibration_crt; break; default: g_debug ("using LCD calibration matrix"); - device_calibration = &ctx->priv->calibration_lcd; + device_calibration = &priv->calibration_lcd; break; } @@ -449,10 +458,11 @@ GParamSpec *pspec) { HueyCtx *ctx = HUEY_CTX (object); + HueyCtxPrivate *priv = GET_PRIVATE (ctx); switch (prop_id) { case PROP_DEVICE: - g_value_set_object (value, ctx->priv->device); + g_value_set_object (value, priv->device); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -468,10 +478,11 @@ huey_ctx_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { HueyCtx *ctx = HUEY_CTX (object); + HueyCtxPrivate *priv = GET_PRIVATE (ctx); switch (prop_id) { case PROP_DEVICE: - ctx->priv->device = g_value_dup_object (value); + priv->device = g_value_dup_object (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -502,8 +513,6 @@ NULL, NULL, G_USB_TYPE_DEVICE, G_PARAM_READWRITE)); - - g_type_class_add_private (klass, sizeof (HueyCtxPrivate)); } /* @@ -512,10 +521,10 @@ static void huey_ctx_init (HueyCtx *ctx) { - ctx->priv = HUEY_CTX_GET_PRIVATE (ctx); + HueyCtxPrivate *priv = GET_PRIVATE (ctx); - cd_mat33_clear (&ctx->priv->calibration_lcd); - cd_mat33_clear (&ctx->priv->calibration_crt); + cd_mat33_clear (&priv->calibration_lcd); + cd_mat33_clear (&priv->calibration_crt); /* ensure the remote errors are registered */ huey_ctx_error_quark (); @@ -528,10 +537,11 @@ huey_ctx_finalize (GObject *object) { HueyCtx *ctx = HUEY_CTX (object); + HueyCtxPrivate *priv = GET_PRIVATE (ctx); g_return_if_fail (HUEY_IS_CTX (object)); - g_free (ctx->priv->unlock_string); + g_free (priv->unlock_string); G_OBJECT_CLASS (huey_ctx_parent_class)->finalize (object); } diff -Nru colord-1.2.12/lib/huey/huey-ctx.h colord-1.3.2/lib/huey/huey-ctx.h --- colord-1.2.12/lib/huey/huey-ctx.h 2015-04-22 09:56:48.000000000 +0000 +++ colord-1.3.2/lib/huey/huey-ctx.h 2015-10-13 15:24:13.000000000 +0000 @@ -33,24 +33,13 @@ G_BEGIN_DECLS -#define HUEY_TYPE_CTX (huey_ctx_get_type ()) -#define HUEY_CTX(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), HUEY_TYPE_CTX, HueyCtx)) -#define HUEY_CTX_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), HUEY_TYPE_CTX, HueyCtxClass)) -#define HUEY_IS_CTX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), HUEY_TYPE_CTX)) -#define HUEY_IS_CTX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HUEY_TYPE_CTX)) -#define HUEY_CTX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HUEY_TYPE_CTX, HueyCtxClass)) #define HUEY_CTX_ERROR (huey_ctx_error_quark ()) #define HUEY_CTX_TYPE_ERROR (huey_ctx_error_get_type ()) -typedef struct _HueyCtxPrivate HueyCtxPrivate; +#define HUEY_TYPE_CTX (huey_ctx_get_type ()) +G_DECLARE_DERIVABLE_TYPE (HueyCtx, huey_ctx, HUEY, CTX, GObject) -typedef struct -{ - GObject parent; - HueyCtxPrivate *priv; -} HueyCtx; - -typedef struct +struct _HueyCtxClass { GObjectClass parent_class; /*< private >*/ @@ -63,7 +52,7 @@ void (*_huey_ctx_reserved6) (void); void (*_huey_ctx_reserved7) (void); void (*_huey_ctx_reserved8) (void); -} HueyCtxClass; +}; /** * HueyCtxError: @@ -78,7 +67,6 @@ HUEY_CTX_ERROR_LAST } HueyCtxError; -GType huey_ctx_get_type (void); GQuark huey_ctx_error_quark (void); HueyCtx *huey_ctx_new (void); diff -Nru colord-1.2.12/lib/huey/Makefile.in colord-1.3.2/lib/huey/Makefile.in --- colord-1.2.12/lib/huey/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/lib/huey/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -328,6 +328,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -432,6 +433,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/lib/Makefile.in colord-1.3.2/lib/Makefile.in --- colord-1.2.12/lib/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/lib/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -313,6 +313,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -417,6 +418,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/lib/munki/Makefile.in colord-1.3.2/lib/munki/Makefile.in --- colord-1.2.12/lib/munki/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/lib/munki/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -326,6 +326,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -430,6 +431,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/lib/ospark/Makefile.in colord-1.3.2/lib/ospark/Makefile.in --- colord-1.2.12/lib/ospark/Makefile.in 2015-07-29 14:32:31.000000000 +0000 +++ colord-1.3.2/lib/ospark/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -517,6 +517,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -621,6 +622,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/lib/ospark/osp-device.c colord-1.3.2/lib/ospark/osp-device.c --- colord-1.2.12/lib/ospark/osp-device.c 2015-07-06 14:32:39.000000000 +0000 +++ colord-1.3.2/lib/ospark/osp-device.c 2016-03-03 09:36:41.000000000 +0000 @@ -32,8 +32,6 @@ #include #include -#include "cd-cleanup.h" - #include "osp-device.h" #include "osp-enum.h" @@ -55,6 +53,12 @@ /** * osp_device_open: + * @device: a #GUsbDevice instance + * @error: A #GError or %NULL + * + * Opens the device and claims the interface + * + * Return value: %TRUE for success * * Since: 1.2.11 **/ @@ -65,7 +69,7 @@ g_return_val_if_fail (error == NULL || *error == NULL, FALSE); if (!g_usb_device_open (device, error)) - return NULL; + return FALSE; if (!g_usb_device_claim_interface (device, 0x00, 0, error)) { g_prefix_error (error, "Failed to claim interface: "); return FALSE; @@ -93,9 +97,9 @@ gsize offset_rd = 0; gsize offset_wr = 0; guint i; - _cleanup_checksum_free_ GChecksum *csum = NULL; - _cleanup_free_ guint8 *buffer_in = NULL; - _cleanup_free_ guint8 *buffer_out = NULL; + g_autoptr(GChecksum) csum = NULL; + g_autofree guint8 *buffer_in = NULL; + g_autofree guint8 *buffer_out = NULL; g_return_val_if_fail (G_USB_IS_DEVICE (device), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -139,12 +143,13 @@ offset_wr += sizeof(OspProtocolFooter); /* send data */ - cd_buffer_debug (CD_BUFFER_KIND_REQUEST, buffer_in, offset_wr); + if (g_getenv ("SPARK_PROTOCOL_DEBUG") != NULL) + cd_buffer_debug (CD_BUFFER_KIND_REQUEST, buffer_in, offset_wr); if (!g_usb_device_bulk_transfer (device, 0x01, buffer_in, offset_wr, &actual_length, OSP_USB_TIMEOUT_MS, NULL, error)) - return NULL; + return FALSE; /* get reply */ buffer_out = g_new0 (guint8, 64); @@ -152,12 +157,34 @@ buffer_out, OSP_DEVICE_EP_SIZE, &actual_length, OSP_USB_TIMEOUT_MS, NULL, error)) - return NULL; - cd_buffer_debug (CD_BUFFER_KIND_RESPONSE, buffer_out, actual_length); + return FALSE; + if (g_getenv ("SPARK_PROTOCOL_DEBUG") != NULL) + cd_buffer_debug (CD_BUFFER_KIND_RESPONSE, buffer_out, actual_length); /* check the error code */ hdr = (OspProtocolHeader *) buffer_out; - if (hdr->error_code != OSP_ERROR_CODE_SUCCESS) { + switch (hdr->error_code) { + case OSP_ERROR_CODE_SUCCESS: + break; + case OSP_ERROR_CODE_MESSAGE_TOO_LARGE: + case OSP_ERROR_CODE_UNKNOWN_CHECKSUM_TYPE: + case OSP_ERROR_CODE_UNSUPPORTED_PROTOCOL: + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_NO_SUPPORT, + "Failed to %s", + osp_cmd_to_string (cmd)); + return FALSE; + break; + case OSP_ERROR_CODE_COMMAND_DATA_MISSING: + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_NO_DATA, + "Failed to %s", + osp_cmd_to_string (cmd)); + return FALSE; + break; + default: g_set_error (error, OSP_DEVICE_ERROR, OSP_DEVICE_ERROR_INTERNAL, @@ -165,6 +192,7 @@ osp_cmd_to_string (cmd), osp_error_code_to_string (hdr->error_code)); return FALSE; + break; } /* copy out the data */ @@ -193,9 +221,10 @@ buffer_out, OSP_DEVICE_EP_SIZE, &actual_length, OSP_USB_TIMEOUT_MS, NULL, error)) - return NULL; + return FALSE; memcpy (*data_out + offset_wr, buffer_out, OSP_DEVICE_EP_SIZE); - cd_buffer_debug (CD_BUFFER_KIND_RESPONSE, buffer_out, OSP_DEVICE_EP_SIZE); + if (g_getenv ("SPARK_PROTOCOL_DEBUG") != NULL) + cd_buffer_debug (CD_BUFFER_KIND_RESPONSE, buffer_out, OSP_DEVICE_EP_SIZE); offset_wr += 64; } offset_rd += payload_length; @@ -230,6 +259,12 @@ /** * osp_device_get_serial: + * @device: a #GUsbDevice instance + * @error: A #GError or %NULL + * + * Gets the device serial number. + * + * Return value: A string, or %NULL for failure * * Since: 1.2.11 **/ @@ -237,7 +272,7 @@ osp_device_get_serial (GUsbDevice *device, GError **error) { gsize data_len; - _cleanup_free_ guint8 *data = NULL; + g_autofree guint8 *data = NULL; g_return_val_if_fail (G_USB_IS_DEVICE (device), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); @@ -253,15 +288,21 @@ OSP_DEVICE_ERROR, OSP_DEVICE_ERROR_INTERNAL, "Expected serial number, got nothing"); - return FALSE; + return NULL; } /* format value */ - return g_strdup ((const gchar *) data); + return g_strndup ((const gchar *) data, data_len); } /** * osp_device_get_fw_version: + * @device: a #GUsbDevice instance + * @error: A #GError or %NULL + * + * Opens the device and claims the interface + * + * Return value: The firmware version, or %NULL for error * * Since: 1.2.11 **/ @@ -269,7 +310,7 @@ osp_device_get_fw_version (GUsbDevice *device, GError **error) { gsize data_len; - _cleanup_free_ guint8 *data = NULL; + g_autofree guint8 *data = NULL; g_return_val_if_fail (G_USB_IS_DEVICE (device), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); @@ -285,7 +326,7 @@ OSP_DEVICE_ERROR, OSP_DEVICE_ERROR_INTERNAL, "Expected %i bytes, got %li", 2, data_len); - return FALSE; + return NULL; } /* format value */ @@ -293,28 +334,317 @@ } /** - * osp_device_take_spectrum: + * osp_device_get_wavelength_cal_for_idx: * - * Since: 1.2.11 + * Since: 1.3.1 **/ -CdSpectrum * -osp_device_take_spectrum (GUsbDevice *device, GError **error) +static gboolean +osp_device_get_wavelength_cal_for_idx (GUsbDevice *device, + guint idx, + gfloat *cal, + GError **error) { - CdSpectrum *sp; - gdouble val; gsize data_len; - guint32 sample_duration = 100000; /* us */ - guint8 bin_factor = 0; + guint8 idx_buf[1] = { idx }; + g_autofree guint8 *data = NULL; + + g_return_val_if_fail (G_USB_IS_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + /* query hardware */ + if (!osp_device_query (device, OSP_CMD_GET_WAVELENGTH_COEFFICIENT, + idx_buf, 1, &data, &data_len, error)) + return FALSE; + + /* check values */ + if (data_len != 4) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "Expected %i bytes, got %li", 4, data_len); + return FALSE; + } + + /* convert to floating point */ + if (cal != NULL) + *cal = *((gfloat *) data); + + /* format value */ + return TRUE; +} + +/** + * osp_device_get_wavelength_start: + * @device: a #GUsbDevice instance + * @error: A #GError or %NULL + * + * Gets the starting wavelength for the sensor. + * + * Return value: A value in nm, or -1 for error + * + * Since: 1.3.1 + **/ +gdouble +osp_device_get_wavelength_start (GUsbDevice *device, GError **error) +{ + gfloat tmp = -1.f; + + /* get from hardware */ + if (!osp_device_get_wavelength_cal_for_idx (device, 0, &tmp, error)) + return -1.f; + + /* check values */ + if (tmp < 0) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "Not a valid start, got %f", tmp); + return -1.f; + } + + return (gdouble) tmp; +} + +/** + * osp_device_get_wavelength_cal: + * @device: a #GUsbDevice instance + * @length: the size of the returned array + * @error: A #GError or %NULL + * + * Gets the wavelength coefficients for the sensor. + * + * Return value: An array of coefficients + * + * Since: 1.3.1 + **/ +gdouble * +osp_device_get_wavelength_cal (GUsbDevice *device, guint *length, GError **error) +{ + gboolean ret; + gdouble *coefs = NULL; + gfloat cx; + gsize data_len; guint i; - _cleanup_free_ guint8 *data = NULL; + g_autofree guint8 *data = NULL; g_return_val_if_fail (G_USB_IS_DEVICE (device), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - /* return every pixel */ - if (!osp_device_send_command (device, OSP_CMD_SET_PIXEL_BINNING_FACTOR, - &bin_factor, 1, error)) + /* query hardware */ + if (!osp_device_query (device, OSP_CMD_GET_WAVELENGTH_COEFFICIENT_COUNT, + NULL, 0, &data, &data_len, error)) + return NULL; + + /* check values */ + if (data_len != 1) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "Expected 1 bytes, got %li", data_len); return NULL; + } + + /* check sanity */ + if (data[0] != 4) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "Expected 4 coefs, got %i", data[0]); + return NULL; + } + + /* get the coefs */ + coefs = g_new0 (gdouble, data[0] - 1); + for (i = 0; i < (guint) data[0] - 1; i++) { + ret = osp_device_get_wavelength_cal_for_idx (device, + i + 1, + &cx, + error); + if (!ret) + return NULL; + coefs[i] = cx; + } + + /* this is optional */ + if (length != NULL) + *length = data[0] - 1; + + /* success */ + return coefs; +} + +/** + * osp_device_get_nonlinearity_cal_for_idx: + * + * Since: 1.3.1 + **/ +static gboolean +osp_device_get_nonlinearity_cal_for_idx (GUsbDevice *device, + guint idx, + gfloat *cal, + GError **error) +{ + gsize data_len; + guint8 idx_buf[1] = { idx }; + g_autofree guint8 *data = NULL; + + g_return_val_if_fail (G_USB_IS_DEVICE (device), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + /* query hardware */ + if (!osp_device_query (device, OSP_CMD_GET_NONLINEARITY_COEFFICIENT, + idx_buf, 1, &data, &data_len, error)) + return FALSE; + + /* check values */ + if (data_len != 4) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "Expected %i bytes, got %li", 4, data_len); + return FALSE; + } + + /* convert to floating point */ + if (cal != NULL) + *cal = *((gfloat *) data); + + /* format value */ + return TRUE; +} + +/** + * osp_device_get_nonlinearity_cal: + * @device: a #GUsbDevice instance + * @length: the size of the returned array + * @error: A #GError or %NULL + * + * Gets the nonlinearity values for the sensor. + * + * Return value: An array of coefficients + * + * Since: 1.3.1 + **/ +gdouble * +osp_device_get_nonlinearity_cal (GUsbDevice *device, guint *length, GError **error) +{ + gboolean ret; + gdouble *coefs = NULL; + gfloat cx; + gsize data_len; + guint i; + g_autofree guint8 *data = NULL; + + g_return_val_if_fail (G_USB_IS_DEVICE (device), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + /* query hardware */ + if (!osp_device_query (device, OSP_CMD_GET_NONLINEARITY_COEFFICIENT_COUNT, + NULL, 0, &data, &data_len, error)) + return NULL; + + /* check values */ + if (data_len != 1) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "Expected 1 bytes, got %li", data_len); + return NULL; + } + + /* check sanity */ + if (data[0] != 8) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "Expected 8 coefs, got %i", data[0]); + return NULL; + } + + /* get the coefs */ + coefs = g_new0 (gdouble, data[0]); + for (i = 0; i < data[0]; i++) { + ret = osp_device_get_nonlinearity_cal_for_idx (device, + i, + &cx, + error); + if (!ret) + return NULL; + coefs[i] = cx; + } + + /* this is optional */ + if (length != NULL) + *length = data[0]; + + /* success */ + return coefs; +} + +/** + * osp_device_get_irradiance_cal: + * @device: a #GUsbDevice instance + * @length: the size of the returned array + * @error: A #GError or %NULL + * + * Gets the irradiance spectrum for the sensor. + * + * Return value: An array of coefficients + * + * Since: 1.3.1 + **/ +gdouble * +osp_device_get_irradiance_cal (GUsbDevice *device, guint *length, GError **error) +{ + gdouble *coefs = NULL; + gsize data_len; + guint i; + g_autofree guint8 *data = NULL; + + g_return_val_if_fail (G_USB_IS_DEVICE (device), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + /* query hardware */ + if (!osp_device_query (device, OSP_CMD_GET_IRRADIANCE_CALIBRATION, + NULL, 0, &data, &data_len, error)) + return NULL; + + /* check values */ + if (data_len != 4096 * 4) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "Expected %i bytes, got %li", 4096 * 4, data_len); + return NULL; + } + + /* copy out the coefs */ + coefs = g_new0 (gdouble, 4096); + for (i = 0; i < 4096; i++) + coefs[i] = *((gfloat *) &data[i*4]); + + /* this is optional */ + if (length != NULL) + *length = 4096; + + /* success */ + return coefs; +} + +/** + * osp_device_take_spectrum_internal: + **/ +static CdSpectrum * +osp_device_take_spectrum_internal (GUsbDevice *device, + guint64 sample_duration, + GError **error) +{ + CdSpectrum *sp; + gdouble val; + gsize data_len; + guint i; + g_autofree guint8 *data = NULL; + g_autoptr(GTimer) t = NULL; /* set integral time in us */ if (!osp_device_send_command (device, OSP_CMD_SET_INTEGRATION_TIME, @@ -322,9 +652,12 @@ return NULL; /* get spectrum */ + t = g_timer_new (); if (!osp_device_query (device, OSP_CMD_GET_AND_SEND_RAW_SPECTRUM, NULL, 0, &data, &data_len, error)) return NULL; + g_debug ("For integration of %.0fms, sensor took %.0fms", + sample_duration / 1000.f, g_timer_elapsed (t, NULL) * 1000.f); /* check values */ if (data_len != 2048) { @@ -332,18 +665,191 @@ OSP_DEVICE_ERROR, OSP_DEVICE_ERROR_INTERNAL, "Expected %i bytes, got %li", 2048, data_len); - return FALSE; + return NULL; } /* export */ sp = cd_spectrum_sized_new (1024); - cd_spectrum_set_id (sp, "raw"); - cd_spectrum_set_start (sp, 380); - cd_spectrum_set_end (sp, 700); - cd_spectrum_set_norm (sp, FALSE); for (i = 0; i < 1024; i++) { val = data[i*2+1] * 256 + data[i*2+0]; cd_spectrum_add_value (sp, val / (gdouble) 0xffff); } + + /* the maximum value the hardware can return is 0x3fff */ + val = cd_spectrum_get_value_max (sp); + if (val > 0.25) { + g_set_error (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_INTERNAL, + "spectral max should be <= 0.25f, was %f", + val); + cd_spectrum_free (sp); + return NULL; + } + + return sp; +} + +/** + * osp_device_take_spectrum_full: + * @device: a #GUsbDevice instance + * @sample_duration: the sample duration in µs + * @error: A #GError or %NULL + * + * Returns a spectrum for a set sample duration. + * + * Return value: A #CdSpectrum, or %NULL for error + * + * Since: 1.3.1 + **/ +CdSpectrum * +osp_device_take_spectrum_full (GUsbDevice *device, + guint64 sample_duration, + GError **error) +{ + CdSpectrum *sp; + gdouble start; + guint8 bin_factor = 0; + g_autofree gdouble *cx = NULL; + g_autoptr(CdSpectrum) sp_dc = NULL; + g_autoptr(CdSpectrum) sp_raw = NULL; + + g_return_val_if_fail (G_USB_IS_DEVICE (device), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + /* return every pixel */ + if (!osp_device_send_command (device, OSP_CMD_SET_PIXEL_BINNING_FACTOR, + &bin_factor, 1, error)) + return NULL; + + /* get spectrum */ + sp_raw = osp_device_take_spectrum_internal (device, sample_duration, error); + if (sp_raw == NULL) + return NULL; + cd_spectrum_set_id (sp_raw, "raw"); + + /* remove any DC offset from the sensor by doing a 10us reading -- + * ideally this would be 0us, but we have to use what we have */ + sp_dc = osp_device_take_spectrum_internal (device, 10, error); + if (sp_dc == NULL) + return NULL; + cd_spectrum_set_id (sp_dc, "dc"); + + /* get coefficients */ + cx = osp_device_get_wavelength_cal (device, NULL, error); + if (cx == NULL) + return NULL; + + /* get start */ + start = osp_device_get_wavelength_start (device, error); + if (start < 0) + return NULL; + + /* return the reading without a DC component */ + sp = cd_spectrum_subtract (sp_raw, sp_dc, 5); + cd_spectrum_set_start (sp, start); + cd_spectrum_set_norm (sp, 4); + cd_spectrum_set_wavelength_cal (sp, cx[0], cx[1], cx[2]); + return sp; +} + +/** + * osp_device_take_spectrum: + * @device: a #GUsbDevice instance. + * @error: A #GError or %NULL + * + * Returns a spectrum. The optimal sample duration is calculated automatically. + * + * Return value: A #CdSpectrum, or %NULL for error + * + * Since: 1.2.11 + **/ +CdSpectrum * +osp_device_take_spectrum (GUsbDevice *device, GError **error) +{ + const guint sample_duration_max_secs = 3; + gboolean relax_requirements = FALSE; + gdouble max; + gdouble scale = 0.f; + guint64 sample_duration = 10000; /* us */ + CdSpectrum *sp = NULL; + guint i; + + g_return_val_if_fail (G_USB_IS_DEVICE (device), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + /* loop until we're in 1/4 to 3/4 FSD */ + for (i = 0; i < 5; i++) { + g_autoptr(CdSpectrum) sp_probe = NULL; + + /* for the last try, relax what we deem acceptable so we can + * measure very black things with a long integration time */ + if (i == 4) + relax_requirements = TRUE; + + /* take a measurement */ + sp_probe = osp_device_take_spectrum_full (device, + sample_duration, + error); + if (sp_probe == NULL) + return NULL; + + /* sensor picked up nothing, take action */ + max = cd_spectrum_get_value_max (sp_probe); + if (max < 0.001f) { + sample_duration *= 100.f; + g_debug ("sensor read no data, setting duration to %luus", + sample_duration); + continue; + } + + /* sensor is saturated, take action */ + if (max > 0.99f) { + sample_duration /= 100.f; + g_debug ("sensor saturated, setting duration to %luus", + sample_duration); + continue; + } + + /* break out if we got valid readings */ + if (max > 0.25f && max < 0.75f) { + sp = cd_spectrum_dup (sp_probe); + break; + } + + /* be more accepting */ + if (relax_requirements && max > 0.01f) { + sp = cd_spectrum_dup (sp_probe); + break; + } + + /* aim for FSD / 2 */ + scale = (gdouble) 0.5 / max; + sample_duration *= scale; + g_debug ("for max of %f, using scale=%f for duration %luus", + max, scale, sample_duration); + + /* limit this to something sane */ + if (sample_duration / G_USEC_PER_SEC > sample_duration_max_secs) { + g_debug ("limiting duration from %lus to %is", + sample_duration / G_USEC_PER_SEC, + sample_duration_max_secs); + sample_duration = sample_duration_max_secs * G_USEC_PER_SEC; + relax_requirements = TRUE; + } + } + + /* no suitable readings */ + if (sp == NULL) { + g_set_error_literal (error, + OSP_DEVICE_ERROR, + OSP_DEVICE_ERROR_NO_DATA, + "Got no valid data"); + return NULL; + } + + /* scale with the new integral time */ + cd_spectrum_set_norm (sp, cd_spectrum_get_norm (sp) / scale); + g_debug ("normalised spectral max is %f", cd_spectrum_get_value_max (sp)); return sp; } diff -Nru colord-1.2.12/lib/ospark/osp-device.h colord-1.3.2/lib/ospark/osp-device.h --- colord-1.2.12/lib/ospark/osp-device.h 2015-07-06 14:32:08.000000000 +0000 +++ colord-1.3.2/lib/ospark/osp-device.h 2015-10-26 15:53:31.000000000 +0000 @@ -45,12 +45,31 @@ CdSpectrum *osp_device_take_spectrum (GUsbDevice *device, GError **error) G_GNUC_WARN_UNUSED_RESULT; +CdSpectrum *osp_device_take_spectrum_full (GUsbDevice *device, + guint64 sample_duration, + GError **error) + G_GNUC_WARN_UNUSED_RESULT; gchar *osp_device_get_serial (GUsbDevice *device, GError **error) G_GNUC_WARN_UNUSED_RESULT; gchar *osp_device_get_fw_version (GUsbDevice *device, GError **error) G_GNUC_WARN_UNUSED_RESULT; +gdouble *osp_device_get_nonlinearity_cal(GUsbDevice *device, + guint *length, + GError **error) + G_GNUC_WARN_UNUSED_RESULT; +gdouble *osp_device_get_irradiance_cal (GUsbDevice *device, + guint *length, + GError **error) + G_GNUC_WARN_UNUSED_RESULT; +gdouble *osp_device_get_wavelength_cal (GUsbDevice *device, + guint *length, + GError **error) + G_GNUC_WARN_UNUSED_RESULT; +gdouble osp_device_get_wavelength_start (GUsbDevice *device, + GError **error) + G_GNUC_WARN_UNUSED_RESULT; gboolean osp_device_open (GUsbDevice *device, GError **error) G_GNUC_WARN_UNUSED_RESULT; diff -Nru colord-1.2.12/lib/ospark/osp-self-test.c colord-1.3.2/lib/ospark/osp-self-test.c --- colord-1.2.12/lib/ospark/osp-self-test.c 2015-07-06 14:32:39.000000000 +0000 +++ colord-1.3.2/lib/ospark/osp-self-test.c 2015-10-26 15:53:31.000000000 +0000 @@ -24,8 +24,6 @@ #include #include -#include "cd-cleanup.h" - #include "osp-device.h" #include "osp-enum.h" @@ -35,8 +33,8 @@ static GUsbDevice * osp_client_get_default (GError **error) { - _cleanup_object_unref_ GUsbContext *usb_ctx = NULL; - _cleanup_object_unref_ GUsbDevice *device = NULL; + g_autoptr(GUsbContext) usb_ctx = NULL; + g_autoptr(GUsbDevice) device = NULL; g_return_val_if_fail (error == NULL || *error == NULL, NULL); @@ -45,7 +43,7 @@ if (usb_ctx == NULL) { g_set_error (error, G_USB_DEVICE_ERROR, - G_USB_DEVICE_ERROR_NO_DEVICE, + G_USB_DEVICE_ERROR_NOT_SUPPORTED, "No device found; USB initialisation failed"); return NULL; } @@ -70,9 +68,9 @@ guint8 cmd[4]; guint i; guint j; - _cleanup_strv_free_ gchar **lines = NULL; - _cleanup_free_ gchar *data = NULL; - _cleanup_error_free_ GError *error = NULL; + g_auto(GStrv) lines = NULL; + g_autofree gchar *data = NULL; + g_autoptr(GError) error = NULL; if (!g_file_test ("protocol-dump.csv", G_FILE_TEST_EXISTS)) return; @@ -81,7 +79,7 @@ lines = g_strsplit (data, "\n", -1); for (i = 0; lines[i] != NULL; i++) { - _cleanup_strv_free_ gchar **tokens = NULL; + g_auto(GStrv) tokens = NULL; tmp = g_strstr_len (lines[i], -1, "OUT txn"); if (tmp == NULL) continue; @@ -96,12 +94,12 @@ static void osp_test_reading_xyz_func (void) { - CdSpectrum *sp; guint i, j; - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ GUsbDevice *device = NULL; - _cleanup_free_ gchar *serial = NULL; - _cleanup_free_ gchar *fwver = NULL; + g_autofree gchar *fwver = NULL; + g_autofree gchar *serial = NULL; + g_autoptr(CdSpectrum) sp = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GUsbDevice) device = NULL; /* load the device */ device = osp_client_get_default (&error); @@ -131,7 +129,50 @@ g_print ("*"); g_print ("\n"); } - cd_spectrum_free (sp); +} + +static void +osp_test_wavelength_cal_func (void) +{ + g_autoptr(GError) error = NULL; + g_autoptr(GUsbDevice) device = NULL; + g_autofree gdouble *coefficients = NULL; + gdouble start; + + /* load the device */ + device = osp_client_get_default (&error); + if (device == NULL && g_error_matches (error, + G_USB_DEVICE_ERROR, + G_USB_DEVICE_ERROR_NO_DEVICE)) { + g_debug ("skipping tests: %s", error->message); + return; + } + g_assert_no_error (error); + g_assert (device != NULL); + + /* get coefficients */ + coefficients = osp_device_get_wavelength_cal (device, NULL, &error); + g_assert_no_error (error); + g_assert (coefficients != NULL); + g_assert_cmpfloat (ABS (coefficients[0] - 0.37f), <, 0.1f); + g_assert_cmpfloat (ABS (coefficients[1] - 0.00f), <, 0.1f); + g_assert_cmpfloat (ABS (coefficients[2] - 0.00f), <, 0.1f); + + /* get start */ + start = osp_device_get_wavelength_start (device, &error); + g_assert_no_error (error); + g_assert (start > 0); + g_assert_cmpfloat (ABS (start - 355), <, 5); + + /* get irradiance coefficients */ + coefficients = osp_device_get_irradiance_cal (device, NULL, &error); + g_assert_error (error, OSP_DEVICE_ERROR, OSP_DEVICE_ERROR_NO_DATA); + g_clear_error (&error); + + /* get nonlinearity coefficients */ + coefficients = osp_device_get_nonlinearity_cal (device, NULL, &error); + g_assert_error (error, OSP_DEVICE_ERROR, OSP_DEVICE_ERROR_NO_DATA); + g_clear_error (&error); } int @@ -144,6 +185,7 @@ /* tests go here */ g_test_add_func ("/Spark/protocol", osp_test_protocol_func); + g_test_add_func ("/Spark/wavelength-cal", osp_test_wavelength_cal_func); g_test_add_func ("/Spark/reading-xyz", osp_test_reading_xyz_func); return g_test_run (); diff -Nru colord-1.2.12/ltmain.sh colord-1.3.2/ltmain.sh --- colord-1.2.12/ltmain.sh 2015-04-22 09:56:46.000000000 +0000 +++ colord-1.3.2/ltmain.sh 2016-02-17 13:19:30.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru colord-1.2.12/m4/libtool.m4 colord-1.3.2/m4/libtool.m4 --- colord-1.2.12/m4/libtool.m4 2015-04-22 09:56:49.000000000 +0000 +++ colord-1.3.2/m4/libtool.m4 2016-02-17 13:19:30.000000000 +0000 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,31 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +747,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +798,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,7 +1386,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -1369,19 +1438,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1389,7 +1459,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1398,7 +1468,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1414,7 +1484,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1433,11 +1503,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1445,7 +1515,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1476,7 +1546,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1512,7 +1582,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1539,7 +1609,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1561,7 +1631,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1580,10 +1650,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1604,7 +1674,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1644,7 +1714,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1694,22 +1764,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1725,7 +1796,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1753,7 +1824,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1800,9 +1871,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1828,7 +1899,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1849,7 +1920,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1859,44 +1930,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1905,21 +1984,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1929,7 +2008,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1939,9 +2018,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2033,8 +2112,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2044,8 +2123,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2072,8 +2151,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2085,15 +2164,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2107,12 +2186,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2136,7 +2215,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2154,6 +2233,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2164,17 +2284,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2190,28 +2311,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2225,7 +2353,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2234,7 +2362,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2251,14 +2379,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2266,41 +2397,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2310,18 +2491,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2329,8 +2510,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2342,7 +2523,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2351,8 +2532,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2368,17 +2549,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2387,8 +2568,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2415,7 +2596,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2428,8 +2609,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2442,7 +2623,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2455,8 +2636,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2469,8 +2650,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2488,12 +2669,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2518,26 +2700,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2555,14 +2726,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2570,8 +2742,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2580,8 +2752,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2594,8 +2766,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2606,7 +2778,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2614,8 +2786,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2634,8 +2806,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2644,13 +2816,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2678,11 +2870,15 @@ # Add ABI-specific directories to the system library path. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2699,12 +2895,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2714,7 +2910,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2723,58 +2919,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2785,8 +2991,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2796,11 +3002,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2808,8 +3014,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2830,24 +3036,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2865,7 +3071,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2873,8 +3079,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2883,20 +3089,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2929,39 +3145,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2984,11 +3202,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3006,7 +3224,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3033,16 +3251,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3056,7 +3274,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3067,37 +3285,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3183,13 +3438,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3216,8 +3471,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3253,10 +3507,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3295,7 +3545,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3317,8 +3567,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3371,6 +3621,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3411,33 +3664,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3448,21 +3706,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3470,8 +3728,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3517,8 +3775,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3530,7 +3788,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3557,13 +3815,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3575,11 +3848,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3598,7 +3871,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3650,7 +3923,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3683,14 +3956,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3708,21 +4011,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3762,11 +4068,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3792,7 +4098,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3812,9 +4118,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3835,7 +4141,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3862,12 +4168,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3883,17 +4193,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3904,8 +4215,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3921,6 +4232,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3970,7 +4286,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4011,14 +4327,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4047,7 +4363,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4055,7 +4371,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4200,17 +4516,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4221,8 +4538,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4239,6 +4556,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4309,7 +4631,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4317,11 +4639,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4337,7 +4678,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4346,9 +4687,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4373,6 +4714,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4470,7 +4817,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4499,7 +4846,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4565,17 +4912,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4621,9 +4972,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4639,7 +4990,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4647,7 +4998,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4657,7 +5008,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4679,24 +5030,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4709,7 +5060,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4728,7 +5079,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4744,7 +5095,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4754,7 +5105,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4762,61 +5113,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4827,42 +5206,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4876,8 +5260,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4895,8 +5279,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4908,7 +5292,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4923,9 +5307,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4942,15 +5326,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4966,7 +5350,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4974,34 +5358,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5020,13 +5427,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5045,61 +5460,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5108,7 +5542,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5138,16 +5572,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5156,18 +5591,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5176,7 +5611,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5226,33 +5661,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5260,25 +5695,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5286,14 +5721,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5304,7 +5739,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5315,16 +5750,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5337,21 +5772,31 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -5366,7 +5811,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5374,27 +5819,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5405,33 +5842,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5442,24 +5899,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5469,11 +5926,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5483,10 +5940,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5535,43 +5992,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5586,17 +6043,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5613,7 +6070,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5693,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5739,10 +6196,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5782,18 +6239,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5801,8 +6258,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5810,13 +6271,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5824,14 +6285,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5873,7 +6334,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5915,35 +6376,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5979,18 +6440,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6000,6 +6473,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6018,13 +6498,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6042,64 +6530,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6109,7 +6617,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6137,57 +6645,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6198,6 +6707,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6232,18 +6769,15 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6255,7 +6789,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6264,11 +6798,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6278,15 +6812,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6312,13 +6846,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6329,20 +6863,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6357,22 +6891,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6381,22 +6915,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6404,8 +6938,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6414,10 +6948,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6431,59 +6965,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6497,18 +7031,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6516,10 +7050,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6577,22 +7111,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6608,9 +7137,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6628,17 +7157,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6653,21 +7182,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6713,9 +7242,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6723,7 +7252,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6740,30 +7269,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6771,11 +7300,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6784,52 +7313,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6860,10 +7389,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6890,7 +7419,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6912,13 +7441,14 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7002,13 +7532,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7024,16 +7554,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7041,9 +7571,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7058,15 +7588,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7097,51 +7627,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7150,7 +7635,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7170,10 +7655,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7210,7 +7695,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7232,7 +7717,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7246,21 +7731,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7268,11 +7757,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7289,9 +7778,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7301,11 +7790,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7342,7 +7831,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7364,7 +7853,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7380,21 +7869,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7402,11 +7895,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7426,7 +7919,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7436,7 +7929,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7470,7 +7963,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7507,7 +8000,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7541,7 +8034,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7578,7 +8071,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7594,7 +8087,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7604,7 +8097,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7633,7 +8126,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7744,7 +8237,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7761,9 +8254,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7787,27 +8280,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7831,102 +8304,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff -Nru colord-1.2.12/m4/lt~obsolete.m4 colord-1.3.2/m4/lt~obsolete.m4 --- colord-1.2.12/m4/lt~obsolete.m4 2015-04-22 09:56:49.000000000 +0000 +++ colord-1.3.2/m4/lt~obsolete.m4 2016-02-17 13:19:30.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru colord-1.2.12/m4/ltoptions.m4 colord-1.3.2/m4/ltoptions.m4 --- colord-1.2.12/m4/ltoptions.m4 2015-04-22 09:56:49.000000000 +0000 +++ colord-1.3.2/m4/ltoptions.m4 2016-02-17 13:19:30.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru colord-1.2.12/m4/ltsugar.m4 colord-1.3.2/m4/ltsugar.m4 --- colord-1.2.12/m4/ltsugar.m4 2015-04-22 09:56:49.000000000 +0000 +++ colord-1.3.2/m4/ltsugar.m4 2016-02-17 13:19:30.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru colord-1.2.12/m4/ltversion.m4 colord-1.3.2/m4/ltversion.m4 --- colord-1.2.12/m4/ltversion.m4 2015-04-22 09:56:49.000000000 +0000 +++ colord-1.3.2/m4/ltversion.m4 2016-02-17 13:19:30.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru colord-1.2.12/Makefile.am colord-1.3.2/Makefile.am --- colord-1.2.12/Makefile.am 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/Makefile.am 2016-02-17 13:29:45.000000000 +0000 @@ -20,7 +20,7 @@ data # this needs data/profiles/*.icc -if HAVE_UNIX +if HAVE_DAEMON SUBDIRS += \ man \ policy \ diff -Nru colord-1.2.12/Makefile.in colord-1.3.2/Makefile.in --- colord-1.2.12/Makefile.in 2015-07-20 09:49:00.000000000 +0000 +++ colord-1.3.2/Makefile.in 2016-02-17 13:32:55.000000000 +0000 @@ -89,11 +89,11 @@ host_triplet = @host@ # this needs data/profiles/*.icc -@HAVE_UNIX_TRUE@am__append_1 = \ -@HAVE_UNIX_TRUE@ man \ -@HAVE_UNIX_TRUE@ policy \ -@HAVE_UNIX_TRUE@ rules \ -@HAVE_UNIX_TRUE@ src +@HAVE_DAEMON_TRUE@am__append_1 = \ +@HAVE_DAEMON_TRUE@ man \ +@HAVE_DAEMON_TRUE@ policy \ +@HAVE_DAEMON_TRUE@ rules \ +@HAVE_DAEMON_TRUE@ src subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -336,6 +336,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -440,6 +441,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/man/Makefile.in colord-1.3.2/man/Makefile.in --- colord-1.2.12/man/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/man/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -274,6 +274,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -378,6 +379,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/NEWS colord-1.3.2/NEWS --- colord-1.2.12/NEWS 2015-08-19 14:08:00.000000000 +0000 +++ colord-1.3.2/NEWS 2016-03-21 11:37:30.000000000 +0000 @@ -1,3 +1,50 @@ +Version 1.3.2 +~~~~~~~~~~~~~ +Released: 2016-03-21 + +New Features: + - Make building the daemon optional (Richard Hughes) + - Make the session helper optional (Richard Hughes) + - libcolorhug: Add initial support for the v2 protocol used by ColorHug+ (Richard Hughes) + +Bugfixes: + - libcolord: Fix a hard-to-reproduce bug when cancelling async operations (Richard Hughes) + - libcolorhug: Fix a crash when submitting lots of commands at the same time (Richard Hughes) + - Replace '/' with '-' on the basename to fix calibration crash (Canek Peláez Valdés) + +Version 1.3.1 +~~~~~~~~~~~~~ +Released: 2015-11-27 + +New Features: + - Add a sensor error for missing dark calibration (Richard Hughes) + - Add g_autoptr() defines for cd_color* (Richard Hughes) + - Add get-spectral-reading command to colormgr (Richard Hughes) + - Add the GetSpectrum() sensor D-Bus method (Richard Hughes) + - Allow returning spectral readings from the Spark sensor (Richard Hughes) + - libcolord: Add an error enum for missing irradiance calibration (Richard Hughes) + - libcolord: Add a spectral sensor capability (Richard Hughes) + - libcolord: Add cd_sensor_get_spectrum() (Richard Hughes) + - libcolord: Add cd_spectrum_get_value_max() (Richard Hughes) + - libcolord: Add cd_spectrum_limit_min() (Richard Hughes) + - libcolord: Add cd_spectrum_planckian_new_full() (Richard Hughes) + - libcolord: Add cd_spectrum_resample() (Richard Hughes) + - libcolord: Add cd_spectrum_set_wavelength_cal() (Richard Hughes) + - libcolord: Add cd_spectrum_subtract() (Richard Hughes) + - libcolord: Add cd_spectrum_to_string() (Richard Hughes) + +Bugfixes: + - Add a systemd user service corresponding to the D-Bus session service (Simon McVittie) + - Add a tmpfiles.d snippet to fix stateless systems (Tobias Hunger) + - data: Build Rec709 correctly (Richard Hughes) + - Ignore the ColorHug+ in DFU mode (Richard Hughes) + - Install the tmpfiles.d snippet in the right place (Richard Hughes) + - Reset the sensor back to idle after each action (Richard Hughes) + - libcolord: Fix a tiny memory leak in cd_icc_get_tag_data() (Richard Hughes) + - libcolord: Fix saving non-normalized spectra (Richard Hughes) + - libcolord: Make cd_spectrum_free() NULL-safe (Richard Hughes) + - libcolord: Return an error when we fail to estimate the gamma value (Richard Hughes) + Version 1.2.12 ~~~~~~~~~~~~~~ Released: 2015-08-19 diff -Nru colord-1.2.12/po/ca.po colord-1.3.2/po/ca.po --- colord-1.2.12/po/ca.po 2015-04-22 09:56:47.000000000 +0000 +++ colord-1.3.2/po/ca.po 2016-03-21 11:47:05.000000000 +0000 @@ -2,464 +2,951 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Pau Iranzo , 2009. -# Pere Argelich , 2008. -# Richard Hughes , 2011. +# Translators: +# Pau Iranzo , 2009 +# Pere Argelich , 2008 +# Richard Hughes , 2011 +# Robert Antoni Buj i Gelonch , 2016 msgid "" msgstr "" -"Project-Id-Version: PackageKit\n" +"Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-20 12:43+0100\n" -"PO-Revision-Date: 2011-07-20 11:44+0000\n" -"Last-Translator: hughsie \n" -"Language-Team: Catalan (http://www.transifex.net/projects/p/freedesktop/team/ca/)\n" +"POT-Creation-Date: 2016-03-21 11:47+0000\n" +"PO-Revision-Date: 2016-02-13 21:23+0000\n" +"Last-Translator: Robert Antoni Buj i Gelonch \n" +"Language-Team: Catalan (http://www.transifex.com/hughsie/colord/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ca\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:145 ../client/cd-fix-profile.c:169 -msgid "The profile description" -msgstr "" +msgid "Profile to create" +msgstr "Perfil a crear" -#. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:148 ../client/cd-fix-profile.c:172 -msgid "The profile copyright" -msgstr "" +#. TRANSLATORS: program name +msgid "ICC profile creation program" +msgstr "Programa de creació del perfil ICC" -#. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:151 ../client/cd-fix-profile.c:175 -msgid "The device model" -msgstr "" +#. TRANSLATORS: the user didn't read the man page +msgid "Failed to parse arguments" +msgstr "No s'han pogut analitzar els arguments" -#. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:154 ../client/cd-fix-profile.c:178 -msgid "The device manufacturer" -msgstr "" +#. TRANSLATORS: the user forgot to use -o +msgid "No output filename specified" +msgstr "No s'ha especificat cap nom de fitxer de sortida" -#. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:157 -msgid "Profile to create" -msgstr "" +#. TRANSLATORS: this is a command alias +#, c-format +msgid "Alias to %s" +msgstr "Àlies a %s" -#. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:160 -msgid "sRGB CSV filename" -msgstr "" +msgid "Command not found, valid commands are:" +msgstr "No s'ha trobat l'ordre, les ordres vàlides són:" #. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:163 -msgid "Named color prefix" -msgstr "" +msgid "Show extra debugging information" +msgstr "Mostra informació extra de depuració" #. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:166 -msgid "Named color suffix" -msgstr "" +msgid "The locale to use when setting localized text" +msgstr "La configuració regional a utilitzar quan s'estableix el text amb la configuració regional" -#. TRANSLATORS: command line option -#: ../client/cd-create-profile.c:169 -msgid "The metadata in 'key1=value1,key2=value2' format" -msgstr "" +#. TRANSLATORS: command description +msgid "Generate the VCGT calibration of a given size" +msgstr "Genera el calibratge VCGT d'una mida donada" -#. TRANSLATORS: command line tool -#: ../client/cd-create-profile.c:180 -msgid "ICC profile creation program" -msgstr "" +#. TRANSLATORS: command description +msgid "Clear any metadata in the profile" +msgstr "Neteja qualsevol metadada al perfil" -#: ../client/cd-create-profile.c:186 -msgid "Failed to parse arguments" -msgstr "" +#. TRANSLATORS: command description +msgid "Initialize any metadata for the profile" +msgstr "Inicialitza qualsevol metadada per al perfil" -#. TRANSLATORS: the user forgot to use -o -#: ../client/cd-create-profile.c:196 -msgid "No output filename specified" -msgstr "" +#. TRANSLATORS: command description +msgid "Add a metadata item to the profile" +msgstr "Afegeix un element de metadada al perfil" -#. TRANSLATORS: command line option -#: ../client/cd-fix-profile.c:181 -msgid "Clear existing metadata in the profile" -msgstr "" +#. TRANSLATORS: command description +msgid "Remove a metadata item from the profile" +msgstr "Suprimeix un element de metadada del perfil" -#. TRANSLATORS: command line option -#: ../client/cd-fix-profile.c:184 -msgid "Extra metadata in 'key1=value1,key2=value2' format" -msgstr "" +#. TRANSLATORS: command description +msgid "Sets the copyright string" +msgstr "Estableix la cadena del copyright" -#. TRANSLATORS: command line option -#: ../client/cd-fix-profile.c:187 -msgid "Profiles to fix" -msgstr "" +#. TRANSLATORS: command description +msgid "Sets the description string" +msgstr "Estableix la cadena de la descripció" -#. TRANSLATORS: command line tool -#: ../client/cd-fix-profile.c:198 -msgid "ICC profile fix program" -msgstr "" +#. TRANSLATORS: command description +msgid "Sets the manufacturer string" +msgstr "Estableix la cadena del fabricant" + +#. TRANSLATORS: command description +msgid "Sets the model string" +msgstr "Estableix la cadena del model" + +#. TRANSLATORS: command description +msgid "Automatically fix metadata in the profile" +msgstr "Corregeix automàticament les metadades al perfil" + +#. TRANSLATORS: command description +msgid "Set the ICC profile version" +msgstr "Estableix la versió del perfil ICC" + +#. TRANSLATORS: command description +msgid "Export the tag data" +msgstr "Exporta les dades de l'etiqueta" + +#. TRANSLATORS: program name +msgid "Color Management" +msgstr "Gestió de color" + +#. TRANSLATORS: program name +msgid "ICC profile dump program" +msgstr "Programa de bolcat del perfil ICC" + +#. TRANSLATORS: command description +msgid "Create a CMF from CSV data" +msgstr "Crea un CMF des de les dades CSV" + +#. TRANSLATORS: command description +msgid "Create a spectrum from CSV data" +msgstr "Crea un espectre des de les dades CSV" + +#. TRANSLATORS: command description +msgid "Create a CCMX from reference and measurement data" +msgstr "Crea un CCMX des de les dades de referència i mesura" + +#. TRANSLATORS: this is the profile creation date strftime format +msgid "%B %e %Y, %I:%M:%S %p" +msgstr "%e de %B de %Y, %H:%M:%S" + +#. TRANSLATORS: profile owner +#. TRANSLATORS: profile UID +msgid "Owner" +msgstr "Propietari" #. TRANSLATORS: the internal DBus path -#: ../client/cd-util.c:64 ../client/cd-util.c:139 ../client/cd-util.c:240 msgid "Object Path" -msgstr "" +msgstr "Camí a l'objecte" #. TRANSLATORS: the profile format, e.g. #. * ColorModel.OutputMode.OutputResolution #. TRANSLATORS: the device format, e.g. #. * ColorModel.OutputMode.OutputResolution -#: ../client/cd-util.c:70 ../client/cd-util.c:173 msgid "Format" -msgstr "" +msgstr "Format" + +#. TRANSLATORS: the profile title, e.g. +#. * "ColorMunki, HP Deskjet d1300 Series" +msgid "Title" +msgstr "Títol" #. TRANSLATORS: the profile qualifier, e.g. RGB.Plain.300dpi -#: ../client/cd-util.c:75 msgid "Qualifier" -msgstr "" +msgstr "Qualificador" #. TRANSLATORS: the profile type, e.g. 'output' #. TRANSLATORS: the device type, e.g. "printer" #. TRANSLATORS: the sensor type, e.g. 'output' -#: ../client/cd-util.c:80 ../client/cd-util.c:154 ../client/cd-util.c:262 msgid "Type" msgstr "Tipus" #. TRANSLATORS: the profile colorspace, e.g. 'rgb' #. TRANSLATORS: the device colorspace, e.g. "rgb" -#: ../client/cd-util.c:86 ../client/cd-util.c:184 msgid "Colorspace" -msgstr "" +msgstr "Espai de color" #. TRANSLATORS: the object scope, e.g. temp, disk, etc -#: ../client/cd-util.c:92 ../client/cd-util.c:179 msgid "Scope" -msgstr "" +msgstr "Àmbit" #. TRANSLATORS: if the profile has a Video Card Gamma Table lookup -#: ../client/cd-util.c:97 -msgid "Has video gamma table" -msgstr "" +msgid "Gamma Table" +msgstr "Taula de les gammes" + +#. TRANSLATORS: if the profile is installed for all users +msgid "System Wide" +msgstr "Ample del sistema" #. TRANSLATORS: profile filename -#: ../client/cd-util.c:101 msgid "Filename" -msgstr "" +msgstr "Nom de fitxer" #. TRANSLATORS: profile identifier -#: ../client/cd-util.c:105 msgid "Profile ID" -msgstr "" +msgstr "Id. de perfil" -#. TRANSLATORS: the metadata contiained in the profile #. TRANSLATORS: the metadata for the device -#: ../client/cd-util.c:115 ../client/cd-util.c:206 +#. TRANSLATORS: the metadata for the sensor msgid "Metadata" -msgstr "" +msgstr "Metadada" + +msgid "Warning" +msgstr "Advertència" #. TRANSLATORS: this is the time the device was registered #. * with colord, and probably is the same as the system startup #. * unless the device has been explicitly saved in the database -#: ../client/cd-util.c:145 msgid "Created" -msgstr "" +msgstr "Creació" #. TRANSLATORS: this is the time of the last calibration or when #. * the manufacturer-provided profile was assigned by the user -#: ../client/cd-util.c:150 msgid "Modified" -msgstr "" +msgstr "Modificació" + +#. TRANSLATORS: the device enabled state +msgid "Enabled" +msgstr "Habilitat" + +#. TRANSLATORS: if the device is embedded into the computer and +#. * cannot be removed +msgid "Embedded" +msgstr "Incrustat" #. TRANSLATORS: the device model #. TRANSLATORS: sensor model -#: ../client/cd-util.c:158 ../client/cd-util.c:283 msgid "Model" -msgstr "" +msgstr "Model" #. TRANSLATORS: the device vendor #. TRANSLATORS: sensor vendor -#: ../client/cd-util.c:162 ../client/cd-util.c:290 msgid "Vendor" msgstr "Proveïdor" +msgid "Inhibitors" +msgstr "Inhibidors" + #. TRANSLATORS: the device serial number -#: ../client/cd-util.c:166 msgid "Serial" -msgstr "" +msgstr "Número de sèrie" + +#. TRANSLATORS: the device seat identifier, where a seat is +#. * defined as a monitor, keyboard and mouse. +#. * For instance, in a public library one central computer can +#. * have 3 keyboards, 3 displays and 3 mice plugged in and with +#. * systemd these can be setup as three independant seats with +#. * different sessions running on them +msgid "Seat" +msgstr "Focus" #. TRANSLATORS: the device identifier -#: ../client/cd-util.c:188 msgid "Device ID" -msgstr "" +msgstr "Id. de dispositiu" #. TRANSLATORS: the profile for the device -#: ../client/cd-util.c:196 msgid "Profile" -msgstr "" +msgstr "Perfil" + +#. TRANSLATORS: this is the display technology, +#. * and an abbreviation for "Cathode Ray Tube" +msgid "CRT" +msgstr "CRT" + +#. TRANSLATORS: this is a desktop printer +msgid "Printer" +msgstr "Impressora" + +#. TRANSLATORS: a beamer used for presentations +msgid "Projector" +msgstr "Projector" + +#. TRANSLATORS: a spot measurement, e.g. +#. * getting the color from a color swatch +msgid "Spot" +msgstr "Puntual" + +#. TRANSLATORS: the sensor can get a reading of the +#. * ambient light level +msgid "Ambient" +msgstr "Ambient" + +#. TRANSLATORS: this is the display technology +msgid "Calibration" +msgstr "Calibratge" + +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "Calibratge de la foscor" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "Calibratge de la resplendor" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "Espectral" + +#. TRANSLATORS: this is the display technology, +#. * where LCD stands for 'Liquid Crystal Display' +msgid "LCD Generic" +msgstr "LCD genèric" + +#. TRANSLATORS: this is the display technology where +#. * LED stands for 'Light Emitted Diode' +msgid "LED Generic" +msgstr "LED genèric" + +#. TRANSLATORS: this is the display technology, +#. * sometimes called PDP displays. See +#. * http://en.wikipedia.org/wiki/Plasma_display +msgid "Plasma" +msgstr "Plasma" + +#. TRANSLATORS: this is the display technology, +#. * where LCD stands for 'Liquid Crystal Display' +#. * and CCFL stands for 'Cold Cathode Fluorescent Lamp' +msgid "LCD CCFL" +msgstr "LCD CCFL" + +#. TRANSLATORS: this is the display technology where +#. * RGB stands for 'Red Green Blue' and LED stands for +#. * 'Light Emitted Diode' +msgid "LCD RGB LED" +msgstr "LED RGB del LCD" + +#. TRANSLATORS: this is the display technology, where +#. * wide gamut means the display primaries are much +#. * better than normal consumer monitors +msgid "Wide Gamut LCD CCFL" +msgstr "CCFL de LCD de gamma àmplia" + +#. TRANSLATORS: this is the display technology +msgid "Wide Gamut LCD RGB LED" +msgstr "LED RGB de LCD de gamma àmplia" + +#. TRANSLATORS: this is the display technology, where +#. * white means the color of the backlight, i.e. not +#. * RGB LED +msgid "LCD White LED" +msgstr "LED blanc de LCD" + +#. TRANSLATORS: this an unknown display technology +msgid "Unknown" +msgstr "Desconegut" #. TRANSLATORS: the sensor state, e.g. 'idle' -#: ../client/cd-util.c:269 msgid "State" msgstr "Estat" #. TRANSLATORS: sensor serial -#: ../client/cd-util.c:276 msgid "Serial number" -msgstr "" +msgstr "Número de sèrie" + +#. TRANSLATORS: sensor identifier +msgid "Sensor ID" +msgstr "Id. de sensor" + +#. TRANSLATORS: the options for the sensor +msgid "Options" +msgstr "Opcions" #. TRANSLATORS: if the sensor has a colord native driver -#: ../client/cd-util.c:295 msgid "Native" -msgstr "" +msgstr "Natiu" #. TRANSLATORS: if the sensor is locked -#: ../client/cd-util.c:299 msgid "Locked" -msgstr "" +msgstr "Bloquejat" -#. TRANSLATORS: if the sensor supports calibrating an LCD display -#: ../client/cd-util.c:303 -msgid "LCD" -msgstr "" +#. TRANSLATORS: if the sensor supports calibrating different +#. * display types, e.g. LCD, LED, Projector +msgid "Capabilities" +msgstr "Capacitats" -#. TRANSLATORS: if the sensor supports calibrating a CRT display -#: ../client/cd-util.c:307 -msgid "CRT" -msgstr "" +msgid "There are no supported sensors attached" +msgstr "No hi ha cap sensor connectat compatible" -#. TRANSLATORS: if the sensor supports calibrating a printer -#: ../client/cd-util.c:311 -msgid "Printer" -msgstr "" +#. TRANSLATORS: this is the sensor title +msgid "Sensor" +msgstr "Sensor" -#. TRANSLATORS: if the sensor supports spot measurements -#: ../client/cd-util.c:315 -msgid "Spot" -msgstr "" +#. TRANSLATORS: the user needs to change something on the device +msgid "Set the device to the calibrate position and press enter." +msgstr "Ajusteu el dispositiu a la posició de calibratge i premeu la tecla de retorn." + +#. TRANSLATORS: the user needs to change something on the device +msgid "Set the device to the surface position and press enter." +msgstr "Ajusteu el dispositiu a la posició plana i premeu la tecla de retorn." + +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "Poseu el dispositiu en un lloc fosc i premeu la tecla de retorn." + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "Calibra amb una font de llum de 3200 K." -#. TRANSLATORS: if the sensor supports calibrating a projector -#: ../client/cd-util.c:319 -msgid "Projector" -msgstr "" +msgid "Put the device on the color to be measured and press enter." +msgstr "Poseu el dispositiu en el color a mesurar i premeu la tecla de retorn." -#. TRANSLATORS: if the sensor supports getting the ambient light level -#: ../client/cd-util.c:323 -msgid "Ambient" -msgstr "" +msgid "Color" +msgstr "Color" -#. TRANSLATORS: this is a command alias -#: ../client/cd-util.c:380 -#, c-format -msgid "Alias to %s" -msgstr "" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "Sense capacitat espectral" -#: ../client/cd-util.c:458 -msgid "Command not found, valid commands are:" -msgstr "" +#. TRANSLATORS: command line option +msgid "Show client and daemon versions" +msgstr "Mostra les versions del client i del dimoni" -#: ../client/cd-util.c:593 ../client/cd-util.c:631 ../client/cd-util.c:694 -msgid "There are no supported sensors attached" -msgstr "" +#. TRANSLATORS: command line option +msgid "Show the value without any header" +msgstr "Mostra el valor sense cap capçalera" -#. TRANSLATORS: this is the sensor title -#: ../client/cd-util.c:728 -msgid "Sensor" -msgstr "" +#. TRANSLATORS: command line option +msgid "Filter object properties when displaying" +msgstr "Filtra les propietats de l'objecte quan es mostri" -#: ../client/cd-util.c:739 -msgid "Color" -msgstr "" +#. TRANSLATORS: command description +msgid "Dump all debug data to a file" +msgstr "Bolca totes les dades de depuració a un fitxer" #. TRANSLATORS: command description -#: ../client/cd-util.c:1426 msgid "Gets all the color managed devices" -msgstr "" +msgstr "Obté tots els dispositius amb gestió de color" #. TRANSLATORS: command description -#: ../client/cd-util.c:1431 msgid "Gets all the color managed devices of a specific kind" -msgstr "" +msgstr "Obté tots els dispositius amb gestió de color d'un tipus específic" #. TRANSLATORS: command description -#: ../client/cd-util.c:1436 msgid "Gets all the available color profiles" -msgstr "" +msgstr "Obté tots els perfils de color disponibles" #. TRANSLATORS: command description -#: ../client/cd-util.c:1441 msgid "Gets all the available color sensors" -msgstr "" +msgstr "Obté tots els sensors de color disponibles" + +#. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "Obté una lectura espectral des d'un sensor" #. TRANSLATORS: command description -#: ../client/cd-util.c:1446 msgid "Gets a reading from a sensor" -msgstr "" +msgstr "Obté una lectura des d'un sensor" #. TRANSLATORS: command description -#: ../client/cd-util.c:1451 msgid "Locks the color sensor" -msgstr "" +msgstr "Bloqueja el sensor de color" + +#. TRANSLATORS: command description +msgid "Sets one or more sensor options" +msgstr "Estableix una o més opcions del sensor" #. TRANSLATORS: command description -#: ../client/cd-util.c:1456 msgid "Create a device" -msgstr "" +msgstr "Crea un dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1461 -msgid "Find a device" -msgstr "" +msgid "Find a device from the device ID" +msgstr "Troba un dispositiu a partir de l'id. de dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1466 -msgid "Find a device that has a specific property" -msgstr "" +msgid "Find a device with a given property value" +msgstr "Troba un dispositiu amb el valor d'una propietat donada" #. TRANSLATORS: command description -#: ../client/cd-util.c:1471 -msgid "Find a profile" -msgstr "" +msgid "Find a profile from the profile ID" +msgstr "Troba un perfil a partir de l'id. de perfil" #. TRANSLATORS: command description -#: ../client/cd-util.c:1476 msgid "Find a profile by filename" -msgstr "" +msgstr "Troba un perfil amb el nom de fitxer" #. TRANSLATORS: command description -#: ../client/cd-util.c:1481 msgid "Get a standard colorspace" -msgstr "" +msgstr "Obté un espai de color estàndard" #. TRANSLATORS: command description -#: ../client/cd-util.c:1486 msgid "Create a profile" -msgstr "" +msgstr "Crea un perfil" #. TRANSLATORS: command description -#: ../client/cd-util.c:1491 -msgid "Add a profile to a device" -msgstr "" +msgid "Add a profile to a device that already exists" +msgstr "Afegeix un perfil a un dispositiu que ja existeix" #. TRANSLATORS: command description -#: ../client/cd-util.c:1496 msgid "Makes a profile default for a device" -msgstr "" +msgstr "Estableix com a predeterminat un perfil per a un dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1501 msgid "Deletes a device" -msgstr "" +msgstr "Elimina un dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1506 msgid "Deletes a profile" -msgstr "" +msgstr "Elimina un perfil" #. TRANSLATORS: command description -#: ../client/cd-util.c:1511 -msgid "Sets the profile qualifier" -msgstr "" +msgid "Sets extra properties on the profile" +msgstr "Estableix les propietats extres en el perfil" #. TRANSLATORS: command description -#: ../client/cd-util.c:1516 -msgid "Sets the profile filename" -msgstr "" +msgid "Sets the device model" +msgstr "Estableix el model del dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1521 -msgid "Sets the device model" -msgstr "" +msgid "Enables or disables the device" +msgstr "Habilita o inhabilita el dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1526 msgid "Gets the default profile for a device" -msgstr "" +msgstr "Obté el perfil predeterminat per a un dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1531 msgid "Sets the device vendor" -msgstr "" +msgstr "Estableix el proveïdor del dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1536 msgid "Sets the device serial" -msgstr "" +msgstr "Estableix el número de sèrie del dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1541 msgid "Sets the device kind" -msgstr "" +msgstr "Estableix el tipus de dispositiu" + +#. TRANSLATORS: command description +msgid "Inhibits color profiles for this device" +msgstr "Inhibeix els perfils de color per aquest dispositiu" #. TRANSLATORS: command description -#: ../client/cd-util.c:1546 msgid "Returns all the profiles that match a qualifier" -msgstr "" +msgstr "Retorna tots els perfils que coincideixin amb un qualificador" -#. TRANSLATORS: program name -#: ../client/cd-util.c:1559 ../src/cd-main.c:1678 -msgid "Color Management" -msgstr "" +#. TRANSLATORS: command description +msgid "Import a profile and install it for the user" +msgstr "Importa un perfil i instal·la'l per a l'usuari" #. TRANSLATORS: no colord available -#: ../client/cd-util.c:1567 msgid "No connection to colord:" -msgstr "" +msgstr "Sense connexió a colord:" -#: ../policy/org.freedesktop.color.policy.in.h:1 -msgid "Authentication is required to create a color managed device" -msgstr "" +msgid "Client version:" +msgstr "Versió del client:" -#: ../policy/org.freedesktop.color.policy.in.h:2 -msgid "Authentication is required to create a color profile" -msgstr "" +msgid "Daemon version:" +msgstr "Versió del dimoni:" -#: ../policy/org.freedesktop.color.policy.in.h:3 -msgid "Authentication is required to disable profile matching for a device" -msgstr "" +msgid "System vendor:" +msgstr "Proveïdor del sistema:" -#: ../policy/org.freedesktop.color.policy.in.h:4 -msgid "Authentication is required to install the color profile for all users" -msgstr "" +msgid "System model:" +msgstr "Model del sistema:" -#: ../policy/org.freedesktop.color.policy.in.h:5 -msgid "Authentication is required to modify a color profile" -msgstr "" +msgid "Default gamma for the display" +msgstr "Gamma predeterminada per al monitor" -#: ../policy/org.freedesktop.color.policy.in.h:6 -msgid "Authentication is required to modify the color settings for a device" -msgstr "" +msgid "" +"The default target gamma value for the display. Common values are 1.8, 2.2 " +"and 2.4." +msgstr "L'objectiu del valor gamma per defecte de la pantalla. Els valors comuns són 1.8, 2.2 i 2.4." -#: ../policy/org.freedesktop.color.policy.in.h:7 -msgid "Authentication is required to remove a color managed device" -msgstr "" +msgid "Default display target whitepoint" +msgstr "Objectiu del punt blanc del monitor per defecte" -#: ../policy/org.freedesktop.color.policy.in.h:8 -msgid "Authentication is required to remove a color profile" -msgstr "" +msgid "" +"The default target whitepoint in Kelvin for display calibration, with 0 " +"meaning display native. Common values are 6500 for D65 and 5000 for D50." +msgstr "El punt blanc del monitor per defecte en Kèlvins per al calibratge, 0 significa monitor natiu. Els valors comuns són 6500 per a D65 i 5000 per a D50." -#: ../policy/org.freedesktop.color.policy.in.h:9 -msgid "Authentication is required to use the color sensor" -msgstr "" +msgid "Delay between sample intervals" +msgstr "Retard entre els intervals de les mostres" + +msgid "" +"This is the delay between setting the sample color and asking the measuring " +"instrument to take a sample. It is required because both the graphics driver" +" and the display itself introduce latency." +msgstr "Aquest és el temps transcorregut entre l'establiment del color de la mostra i la petició a l'instrument de mesurament per prendre una mostra. Cal perquè tant el controlador de gràfics com el propi monitor presenten latències." + +msgid "Web service profile upload URI" +msgstr "URI de pujada del perfil del servei web" + +msgid "" +"The URI of the web service that allows the calibration tools to upload a " +"specific profile to the Internet." +msgstr "L'URI del servei web que permet que les eines de calibratge pugin un perfil específic a Internet." + +msgid "Compatible with Adobe RGB (1998)" +msgstr "Compatible amb Adobe RGB (1998)" + +msgid "This profile is free of known copyright restrictions" +msgstr "Aquest perfil està lliure de restriccions de drets d'autor coneguts" + +#. TRANSLATORS: a editing space is a profile you use for editing, +#. 'SWOP' is also a trademark so don't translate that +msgid "" +"This editing space was designed as SMPTE-240M and encompasses most of the " +"possible colors available on a CMYK color printer. This is a popular choice " +"for editing photographs and for use in printing, as all the SWOP colors can " +"be reproduced." +msgstr "Aquest espai d'edició va ser dissenyat com a SMPTE-240M i regula la major part dels possibles colors disponibles en una impressora de color CMYK. Aquesta és una opció freqüent per a l'edició de fotografies i per al seu ús en la impressió, ja que tots els colors SWOP poden ser reproduïts." + +#. TRANSLATORS: 'Adobe', 'Photoshop', 'Apple' and 'Illustrator' are +#. trademarks, +#. don't translate those +msgid "" +"This legacy profile was originally created by Adobe for use with Photoshop " +"and Illustrator. As it is based on the original Apple 13\" RGB monitor and " +"is similar to sRGB, it should not be used as a display profile or for new " +"images." +msgstr "Aquest perfil de llegat va ser originalment creat per Adobe per al seu ús amb Photoshop i Illustrator. Com es basa en el monitor RGB original d'Apple de 13\" i és similar a sRGB, no s'ha d'utilitzar com un perfil de visualització o per a les noves imatges." + +#. TRANSLATORS: super-saturated is in reference to colors you can't show on a +#. PC screen +msgid "" +"This editing space can display more saturated colors than Adobe RGB and is " +"suitable for images with highly saturated colors often used in " +"advertisements. It is very similar to DonRGB4, but can show super-saturated " +"red colors sometimes present in Fujichrome Velvia." +msgstr "Aquest espai d'edició pot mostrar colors més saturats que Adobe RGB i és adequat per a imatges amb colors molt saturats que s'utilitzen sovint als anuncis. És molt similar a DonRGB4, però pot mostrar els colors vermells super-saturats sovint presents en Fujichrome Velvia." + +#. TRANSLATORS: 'shadow detail' is the number of black colors you can see +msgid "" +"This editing space can display more saturated colors than Adobe RGB. It is " +"less prone to quantisation errors compared to ProPhoto RGB, although more " +"shadow detail is preserved. In most instances ProPhoto RGB is probably a " +"better choice." +msgstr "Aquest espai d'edició pot mostrar colors més saturats que Adobe RGB. És menys propens a errors de quantificació en comparació amb ProPhoto RGB, encara que es conserven més detalls en les ombres. En la majoria dels casos ProPhoto RGB és probablement una de les millors opcions." + +msgid "Blue" +msgstr "Blau" + +#. TRANSLATORS: the lookup tables in the GPU map one color to another +msgid "" +"This test profile is used to make all colors on the screen slightly more " +"blue by altering the video card lookup table. This allows the user to check " +"the calibration is being applied correctly." +msgstr "Aquest perfil de prova s'utilitza per fer que tots els colors del monitor siguin una mica més blaus mitjançant l'alteració de la taula de cerques de la targeta de vídeo. Això permet a l'usuari verificar que el calibratge s'estigui aplicant correctament." + +#. TRANSLATORS: 'Adobe Photoshop' is a trademark, don't translate +msgid "" +"This is an RGB editing space for use with Adobe Photoshop 5.0 and later. It " +"was designed as an output-centric compromise between ColorMatch RGB and " +"Adobe RGB and used to be preferred by some photograph printing services." +msgstr "Aquest és un espai d'edició RGB per a utilitzar amb Adobe Photoshop 5.0 i posterior. Va ser dissenyat com un compromís entre la producció centrada amb ColorMatch RGB i Adobe RGB i s'utilitza com a preferit amb alguns serveis d'impressió de fotografia." + +#. TRANSLATORS: theoretical in that the profile primaries are not real colors +msgid "" +"This theoretical profile is designed for use in color experiments. You " +"probably don't want to use this profile as a editing space or a display " +"profile." +msgstr "Aquest perfil teòric està dissenyat per a utilitzar-se en experiments de colors. És probable que no vulgueu utilitzar aquest perfil com un espai d'edició o un perfil de visualització." + +#. TRANSLATORS: 'Radius' and 'PressView' are trademarks, please don't +#. translate +msgid "" +"This profile was designed by Radius for the PressView monitor. Only use this" +" profile as a display profile or as a editing space as the profile is not " +"significantly different to sRGB. You should only need to use this profile if" +" viewing images created on a PressView monitor." +msgstr "Aquest perfil va ser dissenyat a Radius per al monitor Pressview. Utilitzeu únicament aquest perfil com un perfil de visualització o com un espai d'edició, ja que el perfil no és significativament diferent de sRGB. Només necessiteu utilitzar aquest perfil si la visualització de les imatges es va crear en un monitor PressView." + +msgid "Crayon Colors" +msgstr "Colors dels llapis de colors" + +#. TRANSLATORS: 'Crayola' is a trademark, please don't translate, +#. also 'named colors' are color swatches with a name, e.g. 'Royal Rose' +msgid "" +"This named color profile contains all the Crayola crayon colors in popular " +"use. It is a test profile designed for testing embedding named colors into " +"documents." +msgstr "Aquest perfil de color especificat conté tots els colors dels llapis de colors de Crayola d'ús popular. És un perfil de prova que està dissenyat per provar la incrustació dels colors amb noms als documents." + +#. TRANSLATORS: saturated means vivid bright colors +msgid "" +"This editing space can display more saturated colors than Adobe RGB and is " +"suitable for images with highly saturated colors often used in " +"advertisements." +msgstr "Aquest espai d'edició pot mostrar colors més saturats que Adobe RGB i és adequat per a les imatges amb colors molt saturats que sovint s'utilitzen als anuncis." + +#. TRANSLATORS: ECI is a trademark, don't translate +msgid "" +"This profile is recommended by the ECI (European Color Initiative) as a " +"editing space for professional image editing and aims to cover all colors " +"that can be printed on printing presses. This is sometimes used as a color " +"data exchange format between publishers and printing houses." +msgstr "Aquest perfil és recomanat per l'ECI (European Color Initiative) com a un espai d'edició per a l'edició d'imatges professional i pretén cobrir tots els colors que es poden imprimir en les premses d'impressió. De vegades s'utilitza com a un format d'intercanvi de dades de colors entre els editors i les impremtes." + +#. TRANSLATORS: lightness is a technical word for brightness +msgid "" +"This profile was designed with a lightness gamma curve which means the " +"monitor will have to be also calibrated in the same way. This profile is " +"only useful for advanced users and is not recommended for general use." +msgstr "Aquest perfil va ser dissenyat amb una corba gamma lleugera, el que vol dir és que el monitor també haurà de ser calibrat de la mateixa manera. Aquest perfil només és útil per als usuaris avançats i no es recomana per a l'ús general." + +#. TRANSLATORS: negatives refers to the film on which a negative image is +#. stored +msgid "" +"This profile was designed for storing archives of scanned transparency film." +" It is suitable for storing images from color negatives, although nowadays " +"ProPhoto RGB is a more popular profile for archival." +msgstr "Aquest perfil va ser dissenyat per a l'emmagatzematge d'arxius de pel·lícules transparents escanejades. És adequat per a l'emmagatzematge d'imatges a partir de negatius de color, encara que avui dia ProPhoto RGB és un perfil més popular per a l'arxivament." + +msgid "FOGRA27L Coated" +msgstr "FOGRA27L estucat" + +#. TRANSLATORS: positive as in not a negative image of what's printed +msgid "" +"This profile is used for positive plate making, printing on paper types 1 " +"and 2 (coated or matte), sheetfed offset. This profile set should no longer " +"be used for production, use FOGRA39L instead." +msgstr "Aquest perfil s'utilitza per a la fabricació de la placa positiva, la impressió en tipus de paper 1 i 2 (estucat o mat), òfset de plecs. Aquest conjunt de perfils ja no s'ha d'utilitzar més per a la producció, en lloc seu utilitzeu FOGRA39L." + +msgid "FOGRA28L Web Coated" +msgstr "FOGRA28L estucat de banda" + +#. TRANSLATORS: paper grade 3 is just a description meaning "not very white", +#. LCW stands for Light Weight Coated +msgid "" +"This profile is used for positive plate making, printing on paper type 3 " +"(LWC), webfed offset. This profile should no longer be used for production, " +"use FOGRA45 instead." +msgstr "Aquest perfil s'utilitza per a la fabricació de la placa positiva, la impressió en tipus de paper 3 (LWC), òfset de banda alimentada. Aquest perfil ja no s'ha d'utilitzar més per a la producció, en lloc seu utilitzeu FOGRA45." + +msgid "FOGRA29L Uncoated" +msgstr "FOGRA29L sense estucar" + +#. TRANSLATORS: yellowish is in reference to the paper color, i.e. not pure +#. white +msgid "" +"This profile is used for positive plate making, printing on paper type 4 " +"(uncoated white), sheetfed offset. This profile should no longer be used for" +" production, use FOGRA47 instead." +msgstr "Aquest perfil s'utilitza per a la fabricació de la placa positiva, la impressió en tipus de paper 4 (blanc sense estucar), òfset de plecs. Aquest perfil ja no s'ha d'utilitzar més per a la producció, en lloc seu utilitzeu FOGRA47." + +msgid "FOGRA30L Uncoated Yellowish" +msgstr "FOGRA30L sense estucar groguenc" + +#. TRANSLATORS: uncoated means "without expensive glossy coating" +msgid "" +"This profile is used for positive plate making, printing on paper type 5 " +"(uncoated yellowish), sheetfed offset." +msgstr "Aquest perfil s'utilitza per a la fabricació de la placa positiva, la impressió en tipus de paper 5 (groguenc sense estucar), òfset de plecs." + +msgid "FOGRA39L Coated" +msgstr "FOGRA39L estucat" + +#. TRANSLATORS: coated refers to the high quality paper covering making the +#. paper +#. better quality, GRACoL is also a trademark don't translate please +msgid "" +"This profile is used for printing on paper types 1 and 2 (coated or matte), " +"sheetfed offset. This profile is not significantly different from U.S. " +"GRACoL 2006 (TR 006)." +msgstr "Aquest perfil s'utilitza per a la fabricació de la placa positiva, la impressió en tipus de paper 1 i 2 (estucat o mat), òfset de plecs. Aquest perfil no és significativament diferent de GRACoL 2006 EUA (TR 006)." + +msgid "FOGRA40L SC Paper" +msgstr "FOGRA40L amb paper SC" + +#. TRANSLATORS: supercalendered means "super smoothed and thin" +msgid "" +"This profile is used for printing on SC (supercalendered) paper, webfed " +"offset. There is no known U.S. equivalent." +msgstr "Aquest perfil s'utilitza per imprimir en paper SC (supercalendered), òfset de banda alimentada. No es coneix un equivalent EUA." + +msgid "FOGRA45L Lightweight Coated" +msgstr "FOGRA45L estucat lleuger" + +#. TRANSLATORS: ISO is a trademark +msgid "" +"This ISO 12647-2:2004 compliant profile is used for printing on improved " +"light-weight coated (LWC) paper for 60 l/cm heatset web offset printing. It " +"replaces FOGRA28L." +msgstr "Aquest perfil compatible amb la norma ISO 12647-2:2004 s'utilitza per imprimir en paper estucat millorat de pes lleuger (LWC) de 60 l/cm òfset de banda assecat per calor. Substitueix FOGRA28L." + +msgid "FOGRA47L Uncoated" +msgstr "FOGRA47L sense estucar" + +#. TRANSLATORS: gsm stands for "grams per square meter" +msgid "" +"This ISO 12647-2 compliant profile is used for printing on 115 gsm uncoated " +"white (paper type 4) for 60 l/cm sheetfed offset printing." +msgstr "Aquest perfil compatible amb la norma ISO 12647-2 s'utilitza per imprimir en paper blanc sense estucar de 115 gsm (paper tipus 4) de 60 l/cm òfset de plecs." + +msgid "GRACoL TR006 Coated" +msgstr "GRACoL estucat TR006" + +#. TRANSLATORS: coated = smooth and expensive +msgid "" +"This profile is used for printing on U.S. grade 1 and 2 coated paper, " +"sheetfed offset and gravure. It is the U.S. equivalent of FOGRA39." +msgstr "Aquest perfil s'utilitza per imprimir als EUA en paper estucat de grau 1 i 2, òfset de plecs i gravat en relleu. És l'equivalent dels EUA FOGRA39." + +msgid "IFRA26S 2004 Newsprint" +msgstr "IFRA26S 2004 amb paper premsa" + +#. TRANSLATORS: TVI stands for 'tone value increase' and is another name for +#. dot gain, coldset means letting the ink dry without heating it +#, no-c-format +msgid "" +"This profile is use for printing on newsprint, and is an ISO12647-3:2005 " +"compliant profile designed for a printing press exhibiting 26% TVI (dot " +"gain). It is recommended by WAN-IFRA for coldset printing on newsprint " +"worldwide." +msgstr "Aquest perfil s'utilitza per a la impressió en paper premsa, i és un perfil compatible amb la norma ISO12647-3:2005 que es va dissenyar per a la impressió de premsa que presenta un TVI (guany de punt) del 26%. És recomanat per WAN-IFRA per a la impressió en paper de diari sec en fred a tot el món." + +#. TRANSLATORS: A little joke: Color Geeks say that NTSC stands for 'Never The +#. Same Color' as it's really a poor choice compared to sRGB +msgid "" +"This profile defines the range of colors used with the NTSC video standard. " +"It is an obsolete standard that has been replaced by SMTE-C. You should only" +" use this profile to decode archived video." +msgstr "Aquest perfil defineix la gamma de colors que s'utilitzen amb l'estàndard de vídeo NTSC. Es tracta d'una norma obsoleta que ha estat substituïda per SMPTE-C. Només heu d'utilitzar aquest perfil per a codificar o descodificar els vídeos." + +#. TRANSLATORS: Please don't translate PAL or SECAM +msgid "" +"This profile defines the range of colors used with the PAL and SECAM video " +"standards and is very similar to sRGB. You should only use this profile to " +"encode or decode video." +msgstr "Aquest perfil defineix la gamma de colors que s'utilitzen amb els estàndards de vídeo PAL i SECAM i és molt similar a sRGB. Només heu d'utilitzar aquest perfil per a codificar o descodificar els vídeos." + +#. TRANSLATORS: Please don't translate 'RGB' or 'RAW' +msgid "" +"Originally designed by Eastman Kodak and called ROMM RGB, this profile can " +"display a very large range of colors and is used by many photographers for " +"rendering, editing and archiving RAW images. Unless you are working with 16 " +"bits per channel precision, you may see color banding when editing images." +msgstr "Originalment dissenyat per Eastman Kodak i anomenat ROMM RGB, aquest perfil pot mostrar una molt àmplia gamma de colors i és utilitzat per molts fotògrafs per a la representació, edició i arxiu d'imatges RAW. A menys que estigueu treballant amb precisió de 16 bits per canal, podeu veure bandes de color quan editeu imatges." + +#. TRANSLATORS: ITU-R is a standards body +msgid "" +"ITU-R recommendation BT.709 is a high-definition television standard that " +"was first approved in 1990. The Rec. 709 profile uses the same range of " +"colors as sRGB although the luminance curve is different." +msgstr "La recomanació de la ITU-R, BT.709 és un estàndard de televisió d'alta definició, que va ser aprovat per primera vegada el 1990. El perfil Rec. 709 utilitza la mateixa gamma de colors que sRGB tot i que la corba de luminància és diferent." + +#. TRANSLATORS: studio recording means 'shows you'll see on TV' +msgid "" +"This is the current standard used by North America and Japan for studio " +"recording. You should only use this profile to encode or decode video." +msgstr "Aquest és l'estàndard actual que s'utilitza a l'Amèrica del Nord i al Japó per a l'enregistrament en estudi. Només heu d'utilitzar aquest perfil per a codificar o descodificar els vídeos." + +msgid "SNAP TR002 Newsprint" +msgstr "SNAP amb paper premsa TR002" + +#. TRANSLATORS: CGATS is a trademark +#, no-c-format +msgid "" +"This is an ANSI CGATS/SNAP TR 002-2007 based profile for printing on " +"newsprint in the U.S., coldset offset. The TVI (dot gain) is 26%." +msgstr "Aquest és un perfil basat en ANSI CGATS/SNAP TR 002-2007 per imprimir en paper premsa als EUA, òfset en fred. El TVI (guany de punt) és del 26%." + +#. TRANSLATORS: Trinitron is a trademark, 'untagged' means an image with an +#. unspecified color profile +msgid "" +"This general purpose profile was designed by Hewlett-Packard and Microsoft " +"and lives on as the default profile on the Internet for untagged RGB colors " +"and used in HDTV. Most uncalibrated displays are able to display most of the" +" colors available in sRGB, although this profile is sometimes a poor choice " +"for printing." +msgstr "Aquest perfil de propòsit general va ser dissenyat per Hewlett-Packard i Microsoft i viu com el perfil per defecte a Internet per als colors RGB no etiquetats i s'utilitza en televisió d'alta definició. La majoria de les pantalles no calibrades són capaços de mostrar la major part dels colors disponibles en sRGB, encara que aquest perfil és de vegades una mala elecció per a la impressió." + +msgid "Swapped Red and Green" +msgstr "Vermell i verd intercanviat" + +#. TRANSLATORS: channels refer to the RGB values in an image +msgid "" +"This test profile swaps the red and green channels and is useful as a visual" +" check that profiles are being applied correctly. If this profile is applied" +" twice, the image looks unchanged." +msgstr "Aquest perfil de prova intercanvia els canals vermell i verd i és útil com a un control visual que els perfils s'estiguin aplicant correctament. Si aquest perfil s'aplica dues vegades, la imatge es veu sense canvis." + +msgid "SWOP TR003 Coated" +msgstr "SWOP estucat TR003" + +#. TRANSLATORS: FOGRA is a trademark +msgid "" +"This profile is used for printing on U.S. grade 3 coated paper, sheetfed " +"offset and gravure. It is used for high quality magazine printing with white" +" paper." +msgstr "Aquest perfil s'utilitza per imprimir als EUA en paper estucat de grau 3, òfset de plecs i gravat en relleu. S'utilitza per a la impressió de revistes d'alta qualitat amb paper blanc." + +msgid "SWOP TR005 Coated" +msgstr "SWOP estucat TR005" + +#. TRANSLATORS: FOGRA is a trademark +msgid "" +"This profile is used for printing on U.S. grade 5 coated paper, sheetfed " +"offset and gravure. It is use for standard magazine printing with yellowish " +"paper." +msgstr "Aquest perfil s'utilitza per imprimir als EUA en paper estucat de grau 5, òfset de plecs i gravat en relleu. S'utilitza per a la impressió de revistes estàndards amb paper groguenc." + +msgid "Wide Gamut RGB" +msgstr "RGB de gamma àmplia" + +#. TRANSLATORS: 'Adobe Systems' is a trademark, don't translate that +msgid "" +"This editing space was designed by Adobe Systems to capture many more colors" +" than Adobe RGB. This profile is used to print to devices such as film " +"recorders and can define many colors that cannot be displayed on a computer " +"screen. Unless you are working with 16 bits per channel precision, you may " +"see color banding when editing images." +msgstr "Aquest espai d'edició va ser dissenyat per Adobe Systems per capturar molts més colors que Adobe RGB. Aquest perfil s'utilitza per imprimir en dispositius com ara gravadores de pel·lícules i pot definir molts colors que no es poden visualitzar en una pantalla d'ordinador. A menys que estigueu treballant amb precisió de 16 bits per canal, podeu veure bandes de color quan editeu imatges." + +msgid "X11 Colors" +msgstr "Colors de X11" + +#. TRANSLATORS: A 'named color profile' contains a list of color swatches that +#. look the same on all computer screens +msgid "" +"This named color profile contains all the colors defined by X11, assuming " +"the source colors were supposed to be sRGB." +msgstr "Aquest perfil de color especificat conté tots els colors definits per X11, assumint que els colors d'origen siguin sRGB." #. SECURITY: #. - Normal users should not have to authenticate to add devices -#. -#: ../policy/org.freedesktop.color.policy.in.h:13 msgid "Create a color managed device" -msgstr "" +msgstr "Crea un dispositiu amb gestió de color" + +msgid "Authentication is required to create a color managed device" +msgstr "Es requereix autenticació per a crear un dispositiu amb gestió de color" #. SECURITY: #. - Normal users should not have to authenticate to add profiles -#. -#: ../policy/org.freedesktop.color.policy.in.h:17 msgid "Create a color profile" -msgstr "" +msgstr "Crea un perfil de color" + +msgid "Authentication is required to create a color profile" +msgstr "Es requereix autenticació per a crear un perfil de color" #. SECURITY: -#. - Normal users should not have to authenticate to profile -#. devices. -#. -#: ../policy/org.freedesktop.color.policy.in.h:22 -msgid "Inhibit color profile selection" -msgstr "" +#. - Normal users should not have to authenticate to delete devices +msgid "Remove a color managed device" +msgstr "Suprimeix un perfil amb gestió de color" + +msgid "Authentication is required to remove a color managed device" +msgstr "Es requereix autenticació per a suprimir un dispositiu amb gestió de color" + +#. SECURITY: +#. - Normal users should not have to authenticate to delete profiles +msgid "Remove a color profile" +msgstr "Suprimeix un perfil de color" + +msgid "Authentication is required to remove a color profile" +msgstr "Es requereix autenticació per a suprimir un perfil de color" + +#. SECURITY: +#. - Normal users should not have to authenticate to modify devices +msgid "Modify color settings for a device" +msgstr "Modifica els ajusts de color per a un dispositiu" + +msgid "Authentication is required to modify the color settings for a device" +msgstr "Es requereix autenticació per a modificar els ajusts de color per a un dispositiu" + +#. SECURITY: +#. - Normal users should not have to authenticate to modify profiles +msgid "Modify a color profile" +msgstr "Modifica un perfil de color" + +msgid "Authentication is required to modify a color profile" +msgstr "Es requereix autenticació per a modificar un perfil de color" #. SECURITY: #. - Normal users require admin authentication to install files system @@ -468,72 +955,51 @@ #. - This should not be set to 'yes' as unprivileged users could then #. set a profile set to all-white or all-black and thus make the #. other sessions unusable. -#. -#: ../policy/org.freedesktop.color.policy.in.h:31 msgid "Install system color profiles" -msgstr "" +msgstr "Instal·la els perfils de color del sistema" -#. SECURITY: -#. - Normal users should not have to authenticate to modify profiles -#. -#: ../policy/org.freedesktop.color.policy.in.h:35 -msgid "Modify a color profile" -msgstr "" - -#. SECURITY: -#. - Normal users should not have to authenticate to modify devices -#. -#: ../policy/org.freedesktop.color.policy.in.h:39 -msgid "Modify color settings for a device" -msgstr "" +msgid "Authentication is required to install the color profile for all users" +msgstr "Es requereix autenticació per a instal·lar els perfils de color del sistema" #. SECURITY: -#. - Normal users should not have to authenticate to delete devices -#. -#: ../policy/org.freedesktop.color.policy.in.h:43 -msgid "Remove a color managed device" -msgstr "" +#. - Normal users should not have to authenticate to profile +#. devices. +msgid "Inhibit color profile selection" +msgstr "Inhibeix la selecció del perfil de color" -#. SECURITY: -#. - Normal users should not have to authenticate to delete profiles -#. -#: ../policy/org.freedesktop.color.policy.in.h:47 -msgid "Remove a color profile" -msgstr "" +msgid "Authentication is required to disable profile matching for a device" +msgstr "Es requereix autenticació per a inhabilitar la coincidència de perfils per a un dispositiu" #. SECURITY: #. - Normal users should not have to authenticate to use the #. colorimeter device. -#. -#: ../policy/org.freedesktop.color.policy.in.h:52 msgid "Use color sensor" -msgstr "" +msgstr "Utilitza el sensor de color" + +msgid "Authentication is required to use the color sensor" +msgstr "Es requereix autenticació per a utilitzar el sensor de color" #. TRANSLATORS: turn on all debugging -#: ../src/cd-debug.c:112 msgid "Show debugging information for all files" -msgstr "" +msgstr "Mostra la informació de depuració per a tots els fitxers" -#: ../src/cd-debug.c:170 msgid "Debugging Options" -msgstr "" +msgstr "Opcions de depuració" -#: ../src/cd-debug.c:171 msgid "Show debugging options" -msgstr "" +msgstr "Mostra les opcions de depuració" #. TRANSLATORS: exit after we've started up, used for user profiling -#: ../src/cd-main.c:1662 msgid "Exit after a small delay" -msgstr "Surt després de un petit retràs" +msgstr "Surt després d'un petit retràs" #. TRANSLATORS: exit straight away, used for automatic profiling -#: ../src/cd-main.c:1665 msgid "Exit after the engine has loaded" msgstr "Surt després que el motor s'hagi carregat" -#: ../src/cd-main.c:1682 -msgid "Color Management D-Bus Service" -msgstr "" - +#. TRANSLATORS: exit straight away, used for automatic profiling +msgid "Create a dummy sensor for testing" +msgstr "Crear un sensor simulat per a proves" +msgid "Color Management D-Bus Service" +msgstr "Servei D-Bus de gestió de color" diff -Nru colord-1.2.12/po/cs.po colord-1.3.2/po/cs.po --- colord-1.2.12/po/cs.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/cs.po 2015-12-02 10:29:59.000000000 +0000 @@ -13,10 +13,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Czech (http://www.transifex.com/projects/p/colord/language/cs/)\n" +"Language-Team: Czech (http://www.transifex.com/hughsie/colord/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -272,6 +272,18 @@ msgid "Calibration" msgstr "Kalibrace" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -364,9 +376,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Umístěte sondu na povrch měřeného zařízení a stlačte enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Barva" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Zobrazit verze klienta a démona" @@ -400,6 +427,10 @@ msgstr "Najde všechny dostupné sondy barev" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Přečte data ze sondy" diff -Nru colord-1.2.12/po/da.po colord-1.3.2/po/da.po --- colord-1.2.12/po/da.po 2015-06-11 16:30:08.000000000 +0000 +++ colord-1.3.2/po/da.po 2015-12-02 10:29:59.000000000 +0000 @@ -3,16 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Joe Hansen , 2015 # Kris Thomsen , 2009-2011 # Richard Hughes , 2011 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-08 14:24+0100\n" -"PO-Revision-Date: 2015-05-01 15:33+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Danish (http://www.transifex.com/projects/p/colord/language/da/)\n" +"Language-Team: Danish (http://www.transifex.com/hughsie/colord/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -117,7 +118,7 @@ #. TRANSLATORS: command description msgid "Create a CCMX from reference and measurement data" -msgstr "" +msgstr "Opret en CCMX fra reference- og måledata" #. TRANSLATORS: this is the profile creation date strftime format msgid "%B %e %Y, %I:%M:%S %p" @@ -268,6 +269,18 @@ msgid "Calibration" msgstr "Kalibrering" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -360,9 +373,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Sæt enheden på overfladepositionen og tryk retur." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Color" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Vis klient- og dæmonversioner" @@ -396,6 +424,10 @@ msgstr "Henter alle tilgængelige color-sensorer" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Henter en læsning fra en sensor" @@ -524,13 +556,13 @@ msgstr "Standardmålets hvidpunkt i Kelvin for skærmkalibrering, hvor 0 er standardskærm. Gængse værdier er 6500 for D65 og 5000 for D50." msgid "Delay between sample intervals" -msgstr "" +msgstr "Forsinkelse mellem prøveintervaller" msgid "" "This is the delay between setting the sample color and asking the measuring " "instrument to take a sample. It is required because both the graphics driver" " and the display itself introduce latency." -msgstr "" +msgstr "Dette er forsinkelsen mellem angivelse af prøvefarven og anmodningen om at måleinstrumentet skal tage en prøve. Den er krævet da både grafikdriveren og skærmen i sig selv introducerer forsinkelse af svartider." msgid "Web service profile upload URI" msgstr "" diff -Nru colord-1.2.12/po/de.po colord-1.3.2/po/de.po --- colord-1.2.12/po/de.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/de.po 2015-12-02 10:29:59.000000000 +0000 @@ -15,10 +15,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: German (http://www.transifex.com/projects/p/colord/language/de/)\n" +"Language-Team: German (http://www.transifex.com/hughsie/colord/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -274,6 +274,18 @@ msgid "Calibration" msgstr "Kalibration" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -366,9 +378,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Gerät an die Oberflächenposition legen und Enter drücken." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Farbe" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Zeige Client- und Daemonversionen an" @@ -402,6 +429,10 @@ msgstr "Ermittelt alle verfügbaren Farbsensoren" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Ermittelt einen Messwert von einem Sensor" diff -Nru colord-1.2.12/po/el.po colord-1.3.2/po/el.po --- colord-1.2.12/po/el.po 2015-06-11 16:30:08.000000000 +0000 +++ colord-1.3.2/po/el.po 2015-12-02 10:29:59.000000000 +0000 @@ -10,10 +10,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-08 14:24+0100\n" -"PO-Revision-Date: 2015-05-01 15:33+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Greek (http://www.transifex.com/projects/p/colord/language/el/)\n" +"Language-Team: Greek (http://www.transifex.com/hughsie/colord/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -118,7 +118,7 @@ #. TRANSLATORS: command description msgid "Create a CCMX from reference and measurement data" -msgstr "" +msgstr "Δημιουργία ενός CCMX από δεδομένα αναφοράς και μετρήσεων" #. TRANSLATORS: this is the profile creation date strftime format msgid "%B %e %Y, %I:%M:%S %p" @@ -269,6 +269,18 @@ msgid "Calibration" msgstr "Βαθμονόμηση " +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -361,9 +373,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Ρυθμίστε τη συσκευή στη θέση της επιφάνειας και πατήστε enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Χρώμα" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Προβολή εκδόσεων πελάτη και υπηρεσίας" @@ -397,6 +424,10 @@ msgstr "Εμφανίζει όλους τους διαθέσιμους αισθητήρες χρωμάτων" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Εμφανίζει το αποτέλεσμα εξόδου από έναν αισθητήρα" diff -Nru colord-1.2.12/po/en_GB.po colord-1.3.2/po/en_GB.po --- colord-1.2.12/po/en_GB.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/en_GB.po 2015-12-02 10:29:59.000000000 +0000 @@ -12,10 +12,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/colord/language/en_GB/)\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/hughsie/colord/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -271,6 +271,18 @@ msgid "Calibration" msgstr "Calibration" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -363,9 +375,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Set the device to the surface position and press enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Colour" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Show client and daemon versions" @@ -399,6 +426,10 @@ msgstr "Gets all the available colour sensors" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Gets a reading from a sensor" diff -Nru colord-1.2.12/po/es.po colord-1.3.2/po/es.po --- colord-1.2.12/po/es.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/es.po 2015-12-02 10:29:59.000000000 +0000 @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Adolfo Jayme Barrientos, 2013,2015 # Adolfo Jayme Barrientos , 2013 # Adolfo Jayme Barrientos, 2013 # Adolfo Jayme Barrientos, 2015 @@ -18,10 +19,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/colord/language/es/)\n" +"Language-Team: Spanish (http://www.transifex.com/hughsie/colord/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -277,6 +278,18 @@ msgid "Calibration" msgstr "Calibración" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -369,9 +382,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Configure el dispositivo en la posición de superficie y pulse Intro." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Color" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Mostrar versiones del cliente y el servicio" @@ -405,6 +433,10 @@ msgstr "Obtiene todos los sensores de color disponibles" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Obtiene una lectura de un sensor" diff -Nru colord-1.2.12/po/eu.po colord-1.3.2/po/eu.po --- colord-1.2.12/po/eu.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/eu.po 2015-12-02 10:29:59.000000000 +0000 @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Basque (http://www.transifex.com/projects/p/colord/language/eu/)\n" +"Language-Team: Basque (http://www.transifex.com/hughsie/colord/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -266,6 +266,18 @@ msgid "Calibration" msgstr "" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -358,9 +370,24 @@ msgid "Set the device to the surface position and press enter." msgstr "" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Kolorea" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "" @@ -394,6 +421,10 @@ msgstr "" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "" diff -Nru colord-1.2.12/po/fi.po colord-1.3.2/po/fi.po --- colord-1.2.12/po/fi.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/fi.po 2015-12-02 10:29:59.000000000 +0000 @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Finnish (http://www.transifex.com/projects/p/colord/language/fi/)\n" +"Language-Team: Finnish (http://www.transifex.com/hughsie/colord/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -268,6 +268,18 @@ msgid "Calibration" msgstr "" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -360,9 +372,24 @@ msgid "Set the device to the surface position and press enter." msgstr "" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Väri" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "" @@ -396,6 +423,10 @@ msgstr "" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "" diff -Nru colord-1.2.12/po/fr.po colord-1.3.2/po/fr.po --- colord-1.2.12/po/fr.po 2015-08-19 14:08:34.000000000 +0000 +++ colord-1.3.2/po/fr.po 2015-12-02 10:29:59.000000000 +0000 @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-19 15:08+0100\n" -"PO-Revision-Date: 2015-08-15 20:53+0000\n" -"Last-Translator: fabricio s \n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" +"Last-Translator: Richard Hughes \n" "Language-Team: French (http://www.transifex.com/hughsie/colord/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -272,6 +272,18 @@ msgid "Calibration" msgstr "Calibrage" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -364,9 +376,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Placer l'appareil en position surface et appuyer sur Entrée" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Couleur" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Montrer les versions du client et du démon" @@ -400,6 +427,10 @@ msgstr "Récupère tous les capteurs de couleurs disponibles" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Lit une valeur depuis le capteur" diff -Nru colord-1.2.12/po/gl.po colord-1.3.2/po/gl.po --- colord-1.2.12/po/gl.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/gl.po 2015-12-02 10:29:59.000000000 +0000 @@ -4,17 +4,17 @@ # # Translators: # Fran Dieguez , 2011 -# Fran Diéguez , 2011-2012 +# Fran Diéguez , 2011-2012,2015 # Miguel Anxo Bouzada , 2011 # Miguel Anxo Bouzada , 2011 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Galician (http://www.transifex.com/projects/p/colord/language/gl/)\n" +"Language-Team: Galician (http://www.transifex.com/hughsie/colord/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -51,7 +51,7 @@ #. TRANSLATORS: command line option msgid "The locale to use when setting localized text" -msgstr "" +msgstr "O locale a usar ao configurar o texto localizado" #. TRANSLATORS: command description msgid "Generate the VCGT calibration of a given size" @@ -99,7 +99,7 @@ #. TRANSLATORS: command description msgid "Export the tag data" -msgstr "" +msgstr "Exportar os datos da etiqueta" #. TRANSLATORS: program name msgid "Color Management" @@ -107,19 +107,19 @@ #. TRANSLATORS: program name msgid "ICC profile dump program" -msgstr "" +msgstr "Programa de volcado de perfíl ICC" #. TRANSLATORS: command description msgid "Create a CMF from CSV data" -msgstr "" +msgstr "Crear un CMF desde datos CSV" #. TRANSLATORS: command description msgid "Create a spectrum from CSV data" -msgstr "" +msgstr "Crear un espectro desde datos CSV" #. TRANSLATORS: command description msgid "Create a CCMX from reference and measurement data" -msgstr "" +msgstr "Crear un CCMX desde os datos de referencia e medida" #. TRANSLATORS: this is the profile creation date strftime format msgid "%B %e %Y, %I:%M:%S %p" @@ -207,7 +207,7 @@ #. TRANSLATORS: if the device is embedded into the computer and #. * cannot be removed msgid "Embedded" -msgstr "" +msgstr "Incrustado" #. TRANSLATORS: the device model #. TRANSLATORS: sensor model @@ -268,55 +268,67 @@ #. TRANSLATORS: this is the display technology msgid "Calibration" +msgstr "Calibrado" + +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" msgstr "" #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" -msgstr "" +msgstr "LCD xenérica" #. TRANSLATORS: this is the display technology where #. * LED stands for 'Light Emitted Diode' msgid "LED Generic" -msgstr "" +msgstr "LED xenérica" #. TRANSLATORS: this is the display technology, #. * sometimes called PDP displays. See #. * http://en.wikipedia.org/wiki/Plasma_display msgid "Plasma" -msgstr "" +msgstr "Plasma" #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' #. * and CCFL stands for 'Cold Cathode Fluorescent Lamp' msgid "LCD CCFL" -msgstr "" +msgstr "LCD CCFL" #. TRANSLATORS: this is the display technology where #. * RGB stands for 'Red Green Blue' and LED stands for #. * 'Light Emitted Diode' msgid "LCD RGB LED" -msgstr "" +msgstr "LCD RGB LED" #. TRANSLATORS: this is the display technology, where #. * wide gamut means the display primaries are much #. * better than normal consumer monitors msgid "Wide Gamut LCD CCFL" -msgstr "" +msgstr "LCD CCFL Gamut ancha" #. TRANSLATORS: this is the display technology msgid "Wide Gamut LCD RGB LED" -msgstr "" +msgstr "LCD RGB LED Gamut ancha" #. TRANSLATORS: this is the display technology, where #. * white means the color of the backlight, i.e. not #. * RGB LED msgid "LCD White LED" -msgstr "" +msgstr "LCD LED branca" #. TRANSLATORS: this an unknown display technology msgid "Unknown" -msgstr "" +msgstr "Descoñecido" #. TRANSLATORS: the sensor state, e.g. 'idle' msgid "State" @@ -345,7 +357,7 @@ #. TRANSLATORS: if the sensor supports calibrating different #. * display types, e.g. LCD, LED, Projector msgid "Capabilities" -msgstr "" +msgstr "Capacidades" msgid "There are no supported sensors attached" msgstr "Non hai sensores compatíbeis conectados" @@ -362,24 +374,39 @@ msgid "Set the device to the surface position and press enter." msgstr "Estabeleza o dispositivo á posición da superficie e prema intro." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Cor" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" -msgstr "" +msgstr "Mostrar versións do cliente e daemon" #. TRANSLATORS: command line option msgid "Show the value without any header" -msgstr "" +msgstr "Mostrar o valor sen ningunha cabeceira" #. TRANSLATORS: command line option msgid "Filter object properties when displaying" -msgstr "" +msgstr "Filtrar propiedades do obxecto ao mostralo" #. TRANSLATORS: command description msgid "Dump all debug data to a file" -msgstr "" +msgstr "Volcar todos os datos de depuración a un ficheiro" #. TRANSLATORS: command description msgid "Gets all the color managed devices" @@ -398,6 +425,10 @@ msgstr "Obtén tódolos sensores de cor dispoñíbeis" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Obtén unha lectura desde un sensor" @@ -415,15 +446,15 @@ #. TRANSLATORS: command description msgid "Find a device from the device ID" -msgstr "" +msgstr "Buscar un dispositivo desde o ID de dispositivo" #. TRANSLATORS: command description msgid "Find a device with a given property value" -msgstr "" +msgstr "Buscar un dispositivo con un valor de propiedade fornecido" #. TRANSLATORS: command description msgid "Find a profile from the profile ID" -msgstr "" +msgstr "Buscar un perfíl desde o ID de perfíl" #. TRANSLATORS: command description msgid "Find a profile by filename" @@ -439,7 +470,7 @@ #. TRANSLATORS: command description msgid "Add a profile to a device that already exists" -msgstr "" +msgstr "Engadir un perfíl a un dispositivo que xa existe" #. TRANSLATORS: command description msgid "Makes a profile default for a device" @@ -455,7 +486,7 @@ #. TRANSLATORS: command description msgid "Sets extra properties on the profile" -msgstr "" +msgstr "Estabelece propiedades adicionais no perfíl" #. TRANSLATORS: command description msgid "Sets the device model" @@ -491,34 +522,34 @@ #. TRANSLATORS: command description msgid "Import a profile and install it for the user" -msgstr "" +msgstr "Importar un perfil e instalao polo usuario" #. TRANSLATORS: no colord available msgid "No connection to colord:" msgstr "Non hai conexión a colord:" msgid "Client version:" -msgstr "" +msgstr "Versión do cliente:" msgid "Daemon version:" -msgstr "" +msgstr "Versión do daemon:" msgid "System vendor:" -msgstr "" +msgstr "Fabricante do sistema:" msgid "System model:" -msgstr "" +msgstr "Modelo do sistema:" msgid "Default gamma for the display" -msgstr "" +msgstr "Gamma predefinido para a pantalla" msgid "" "The default target gamma value for the display. Common values are 1.8, 2.2 " "and 2.4." -msgstr "" +msgstr "O valor de gamma de destino predeterminado para a pantalla. Os valores comúns son 1.8, 2.2 e 2.4" msgid "Default display target whitepoint" -msgstr "" +msgstr "Punto de branco obxectivo predeterminado para a pantalla" msgid "" "The default target whitepoint in Kelvin for display calibration, with 0 " @@ -526,7 +557,7 @@ msgstr "" msgid "Delay between sample intervals" -msgstr "" +msgstr "Retraso entre os intervalos de mostra" msgid "" "This is the delay between setting the sample color and asking the measuring " @@ -535,7 +566,7 @@ msgstr "" msgid "Web service profile upload URI" -msgstr "" +msgstr "URI de subida do perfíl do servizo web" msgid "" "The URI of the web service that allows the calibration tools to upload a " @@ -543,10 +574,10 @@ msgstr "" msgid "Compatible with Adobe RGB (1998)" -msgstr "" +msgstr "Compatíbel con Adobe RGB (1998)" msgid "This profile is free of known copyright restrictions" -msgstr "" +msgstr "Este perfíl é libre de resricións de copyright coñecidas" #. TRANSLATORS: a editing space is a profile you use for editing, #. 'SWOP' is also a trademark so don't translate that @@ -585,7 +616,7 @@ msgstr "" msgid "Blue" -msgstr "" +msgstr "Azul" #. TRANSLATORS: the lookup tables in the GPU map one color to another msgid "" @@ -618,7 +649,7 @@ msgstr "" msgid "Crayon Colors" -msgstr "" +msgstr "Cores Crayon" #. TRANSLATORS: 'Crayola' is a trademark, please don't translate, #. also 'named colors' are color swatches with a name, e.g. 'Royal Rose' @@ -848,7 +879,7 @@ msgstr "" msgid "Wide Gamut RGB" -msgstr "" +msgstr "RGB Gamut ancho" #. TRANSLATORS: 'Adobe Systems' is a trademark, don't translate that msgid "" @@ -860,7 +891,7 @@ msgstr "" msgid "X11 Colors" -msgstr "" +msgstr "Cores X11" #. TRANSLATORS: A 'named color profile' contains a list of color swatches that #. look the same on all computer screens @@ -968,7 +999,7 @@ #. TRANSLATORS: exit straight away, used for automatic profiling msgid "Create a dummy sensor for testing" -msgstr "" +msgstr "Crear un sensor falso para probas" msgid "Color Management D-Bus Service" msgstr "Servizo de xestión de cor D-Bus" diff -Nru colord-1.2.12/po/he.po colord-1.3.2/po/he.po --- colord-1.2.12/po/he.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/he.po 2015-12-02 10:29:59.000000000 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Hebrew (http://www.transifex.com/projects/p/colord/language/he/)\n" +"Language-Team: Hebrew (http://www.transifex.com/hughsie/colord/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -267,6 +267,18 @@ msgid "Calibration" msgstr "" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -359,9 +371,24 @@ msgid "Set the device to the surface position and press enter." msgstr "" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "" @@ -395,6 +422,10 @@ msgstr "" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "" diff -Nru colord-1.2.12/po/hu.po colord-1.3.2/po/hu.po --- colord-1.2.12/po/hu.po 2015-08-19 14:08:34.000000000 +0000 +++ colord-1.3.2/po/hu.po 2015-12-02 10:29:59.000000000 +0000 @@ -15,9 +15,9 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-19 15:08+0100\n" -"PO-Revision-Date: 2015-07-06 19:30+0000\n" -"Last-Translator: Balázs Úr \n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" +"Last-Translator: Richard Hughes \n" "Language-Team: Hungarian (http://www.transifex.com/hughsie/colord/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -274,6 +274,18 @@ msgid "Calibration" msgstr "Kalibráció" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -366,9 +378,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Állítsa be az eszközt a felszíni pozícióba és nyomjon entert." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Szín" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Jelenítse meg a kliens és a daemon verzióját is" @@ -402,6 +429,10 @@ msgstr "Az összes elérhető színérzékelő lekérése" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Adatok lekérése egy érzékelőtől" diff -Nru colord-1.2.12/po/id.po colord-1.3.2/po/id.po --- colord-1.2.12/po/id.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/id.po 2016-03-21 11:47:05.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Andika Triwidada , 2011-2012,2014 +# Andika Triwidada , 2011-2012,2014-2015 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" -"Last-Translator: Richard Hughes \n" -"Language-Team: Indonesian (http://www.transifex.com/projects/p/colord/language/id/)\n" +"POT-Creation-Date: 2016-03-21 11:47+0000\n" +"PO-Revision-Date: 2015-12-10 07:07+0000\n" +"Last-Translator: Andika Triwidada \n" +"Language-Team: Indonesian (http://www.transifex.com/hughsie/colord/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -52,7 +52,7 @@ #. TRANSLATORS: command description msgid "Generate the VCGT calibration of a given size" -msgstr "" +msgstr "Jangkitkan kalibrasi VCGT dari ukuran yang diberikan" #. TRANSLATORS: command description msgid "Clear any metadata in the profile" @@ -92,11 +92,11 @@ #. TRANSLATORS: command description msgid "Set the ICC profile version" -msgstr "" +msgstr "Tata versi profil ICC" #. TRANSLATORS: command description msgid "Export the tag data" -msgstr "" +msgstr "Ekspor data tag" #. TRANSLATORS: program name msgid "Color Management" @@ -108,15 +108,15 @@ #. TRANSLATORS: command description msgid "Create a CMF from CSV data" -msgstr "" +msgstr "Buat suatu CMF dari data CSV" #. TRANSLATORS: command description msgid "Create a spectrum from CSV data" -msgstr "" +msgstr "Buat suatu spektrum dari data CSV" #. TRANSLATORS: command description msgid "Create a CCMX from reference and measurement data" -msgstr "" +msgstr "Buat suatu CCMX dari data pengukuran dan acuan" #. TRANSLATORS: this is the profile creation date strftime format msgid "%B %e %Y, %I:%M:%S %p" @@ -184,7 +184,7 @@ msgstr "Metadata" msgid "Warning" -msgstr "" +msgstr "Peringatan" #. TRANSLATORS: this is the time the device was registered #. * with colord, and probably is the same as the system startup @@ -199,12 +199,12 @@ #. TRANSLATORS: the device enabled state msgid "Enabled" -msgstr "" +msgstr "Difungsikan" #. TRANSLATORS: if the device is embedded into the computer and #. * cannot be removed msgid "Embedded" -msgstr "" +msgstr "Tertanam" #. TRANSLATORS: the device model #. TRANSLATORS: sensor model @@ -267,6 +267,18 @@ msgid "Calibration" msgstr "Kalibrasi" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "Kalibrasi Gelap" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "Kalibrasi Iradiansi" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "Spektral" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -325,7 +337,7 @@ #. TRANSLATORS: sensor identifier msgid "Sensor ID" -msgstr "" +msgstr "ID Sensor" #. TRANSLATORS: the options for the sensor msgid "Options" @@ -359,24 +371,39 @@ msgid "Set the device to the surface position and press enter." msgstr "Atur perangkat ke posisi permukaan dan tekan enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "Tempatkan perangkat pada suatu tempat yang gelap dan tekan enter." + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "Kalibrasi dengan suatu sumber cahaya 3200K." + +msgid "Put the device on the color to be measured and press enter." +msgstr "Tempatkan perangkat pada warna yang akan diukur dan tekan enter." + msgid "Color" msgstr "Warna" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "Tidak ada kapabilitas spektral" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Tampilkan versi klien dan daemon" #. TRANSLATORS: command line option msgid "Show the value without any header" -msgstr "" +msgstr "Tampilkan nilai tanpa kepala apapun" #. TRANSLATORS: command line option msgid "Filter object properties when displaying" -msgstr "" +msgstr "Saring properti objek ketika menampilkan" #. TRANSLATORS: command description msgid "Dump all debug data to a file" -msgstr "" +msgstr "Curahkan semua data awakutu ke suatu berkas" #. TRANSLATORS: command description msgid "Gets all the color managed devices" @@ -395,6 +422,10 @@ msgstr "Dapatkan semua sensor warna yang tersedia" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "Dapatkan sebuah pembacaan spektral dari suatu sensor" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Ambil bacaan dari suatu sensor" @@ -412,15 +443,15 @@ #. TRANSLATORS: command description msgid "Find a device from the device ID" -msgstr "" +msgstr "Temukan suatu perangkat dari ID perangkat" #. TRANSLATORS: command description msgid "Find a device with a given property value" -msgstr "" +msgstr "Temukan suatu perangkat dengan nilai properti yang diberikan" #. TRANSLATORS: command description msgid "Find a profile from the profile ID" -msgstr "" +msgstr "Temukan suatu profil dari ID profil" #. TRANSLATORS: command description msgid "Find a profile by filename" @@ -436,7 +467,7 @@ #. TRANSLATORS: command description msgid "Add a profile to a device that already exists" -msgstr "" +msgstr "Tambahkan sebuah profil ke suatu perangkat yang telah ada" #. TRANSLATORS: command description msgid "Makes a profile default for a device" @@ -488,7 +519,7 @@ #. TRANSLATORS: command description msgid "Import a profile and install it for the user" -msgstr "" +msgstr "Impor sebuah profil dan pasang itu bagi pengguna" #. TRANSLATORS: no colord available msgid "No connection to colord:" @@ -523,7 +554,7 @@ msgstr "Titik putih target baku dalam Kelvin untuk kalibrasi tampilan, dengan 0 berarti alami tampilan. Nilai yang umum adalah 6500 untuk D65 dan 5000 untuk D50." msgid "Delay between sample intervals" -msgstr "" +msgstr "Tundaan antar selang waktu cuplikan" msgid "" "This is the delay between setting the sample color and asking the measuring " @@ -656,7 +687,7 @@ msgstr "" msgid "FOGRA27L Coated" -msgstr "" +msgstr "FOGRA27L Terlapisi" #. TRANSLATORS: positive as in not a negative image of what's printed msgid "" @@ -677,7 +708,7 @@ msgstr "" msgid "FOGRA29L Uncoated" -msgstr "" +msgstr "FOGRA29L Tak Terlapisi" #. TRANSLATORS: yellowish is in reference to the paper color, i.e. not pure #. white @@ -685,7 +716,7 @@ "This profile is used for positive plate making, printing on paper type 4 " "(uncoated white), sheetfed offset. This profile should no longer be used for" " production, use FOGRA47 instead." -msgstr "" +msgstr "Profil ini dipakai untuk pembuatan plat positif, pencetakan pada kertas tipe 4 (putih tanpa lapisan), ofset diasup lembar. Profil ini mestinya tak dipakai lagi untuk produksi, gunakan FOGRA47 sebagai gantinya." msgid "FOGRA30L Uncoated Yellowish" msgstr "" diff -Nru colord-1.2.12/po/it.po colord-1.3.2/po/it.po --- colord-1.2.12/po/it.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/it.po 2015-12-02 10:29:59.000000000 +0000 @@ -11,10 +11,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" -"Last-Translator: Milo Casagrande \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/colord/language/it/)\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" +"Last-Translator: Richard Hughes \n" +"Language-Team: Italian (http://www.transifex.com/hughsie/colord/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -270,6 +270,18 @@ msgid "Calibration" msgstr "Calibrazione" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -362,9 +374,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Impostare il dispositivo alla posizione sulla superficie e premere Invio." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Colore" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Mostra la versione del client e del demone" @@ -398,6 +425,10 @@ msgstr "Ottiene tutti i sensori di colore disponibili" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Ottiene una lettura da un sensore" diff -Nru colord-1.2.12/po/ja.po colord-1.3.2/po/ja.po --- colord-1.2.12/po/ja.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/ja.po 2015-12-02 10:29:59.000000000 +0000 @@ -10,10 +10,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/colord/language/ja/)\n" +"Language-Team: Japanese (http://www.transifex.com/hughsie/colord/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -269,6 +269,18 @@ msgid "Calibration" msgstr "較正" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -361,9 +373,24 @@ msgid "Set the device to the surface position and press enter." msgstr "デバイスを表面位置に設定し、Enter を押してください。" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "色" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "クライアントとデーモンのバージョンを表示します" @@ -397,6 +424,10 @@ msgstr "利用可能なすべてのカラーセンサーを取得" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "センサーから読みだした情報を取得" diff -Nru colord-1.2.12/po/ko.po colord-1.3.2/po/ko.po --- colord-1.2.12/po/ko.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/ko.po 2015-12-02 10:29:59.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Seong-ho Cho , 2012 +# Seong-ho Cho , 2012,2015 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Korean (http://www.transifex.com/projects/p/colord/language/ko/)\n" +"Language-Team: Korean (http://www.transifex.com/hughsie/colord/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -48,11 +48,11 @@ #. TRANSLATORS: command line option msgid "The locale to use when setting localized text" -msgstr "" +msgstr "지역화 텍스트를 설정할 때 사용할 로캘입니다" #. TRANSLATORS: command description msgid "Generate the VCGT calibration of a given size" -msgstr "" +msgstr "주어진 크기의 VCGT 보정 설정을 만듭니다" #. TRANSLATORS: command description msgid "Clear any metadata in the profile" @@ -92,11 +92,11 @@ #. TRANSLATORS: command description msgid "Set the ICC profile version" -msgstr "" +msgstr "ICC 프로파일 버전을 설정합니다" #. TRANSLATORS: command description msgid "Export the tag data" -msgstr "" +msgstr "태그 데이터를 내보냅니다" #. TRANSLATORS: program name msgid "Color Management" @@ -104,19 +104,19 @@ #. TRANSLATORS: program name msgid "ICC profile dump program" -msgstr "" +msgstr "ICC 프로파일 덤프 프로그램" #. TRANSLATORS: command description msgid "Create a CMF from CSV data" -msgstr "" +msgstr "CSV 데이터로 CMF를 만듭니다" #. TRANSLATORS: command description msgid "Create a spectrum from CSV data" -msgstr "" +msgstr "CSV 데이터로 스펙트럼을 만듭니다" #. TRANSLATORS: command description msgid "Create a CCMX from reference and measurement data" -msgstr "" +msgstr "참조 측정 데이터로 CCMX를 만듭니다" #. TRANSLATORS: this is the profile creation date strftime format msgid "%B %e %Y, %I:%M:%S %p" @@ -168,7 +168,7 @@ #. TRANSLATORS: if the profile is installed for all users msgid "System Wide" -msgstr "" +msgstr "시스템 범위" #. TRANSLATORS: profile filename msgid "Filename" @@ -184,13 +184,13 @@ msgstr "메타데이터" msgid "Warning" -msgstr "" +msgstr "경고" #. TRANSLATORS: this is the time the device was registered #. * with colord, and probably is the same as the system startup #. * unless the device has been explicitly saved in the database msgid "Created" -msgstr "만든일시" +msgstr "만든 일시" #. TRANSLATORS: this is the time of the last calibration or when #. * the manufacturer-provided profile was assigned by the user @@ -199,12 +199,12 @@ #. TRANSLATORS: the device enabled state msgid "Enabled" -msgstr "" +msgstr "활성" #. TRANSLATORS: if the device is embedded into the computer and #. * cannot be removed msgid "Embedded" -msgstr "" +msgstr "포함" #. TRANSLATORS: the device model #. TRANSLATORS: sensor model @@ -230,7 +230,7 @@ #. * systemd these can be setup as three independant seats with #. * different sessions running on them msgid "Seat" -msgstr "" +msgstr "시트" #. TRANSLATORS: the device identifier msgid "Device ID" @@ -265,55 +265,67 @@ #. TRANSLATORS: this is the display technology msgid "Calibration" +msgstr "보정" + +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" msgstr "" #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" -msgstr "" +msgstr "일반 LCD" #. TRANSLATORS: this is the display technology where #. * LED stands for 'Light Emitted Diode' msgid "LED Generic" -msgstr "" +msgstr "일반 LED" #. TRANSLATORS: this is the display technology, #. * sometimes called PDP displays. See #. * http://en.wikipedia.org/wiki/Plasma_display msgid "Plasma" -msgstr "" +msgstr "플라즈마" #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' #. * and CCFL stands for 'Cold Cathode Fluorescent Lamp' msgid "LCD CCFL" -msgstr "" +msgstr "LCD CCFL" #. TRANSLATORS: this is the display technology where #. * RGB stands for 'Red Green Blue' and LED stands for #. * 'Light Emitted Diode' msgid "LCD RGB LED" -msgstr "" +msgstr "LCD RGB RED" #. TRANSLATORS: this is the display technology, where #. * wide gamut means the display primaries are much #. * better than normal consumer monitors msgid "Wide Gamut LCD CCFL" -msgstr "" +msgstr "광색역 LCD CCFL" #. TRANSLATORS: this is the display technology msgid "Wide Gamut LCD RGB LED" -msgstr "" +msgstr "광색역 LCD RGB LED" #. TRANSLATORS: this is the display technology, where #. * white means the color of the backlight, i.e. not #. * RGB LED msgid "LCD White LED" -msgstr "" +msgstr "LCD 백색 LED" #. TRANSLATORS: this an unknown display technology msgid "Unknown" -msgstr "" +msgstr "알 수 없음" #. TRANSLATORS: the sensor state, e.g. 'idle' msgid "State" @@ -325,7 +337,7 @@ #. TRANSLATORS: sensor identifier msgid "Sensor ID" -msgstr "" +msgstr "센서 ID" #. TRANSLATORS: the options for the sensor msgid "Options" @@ -342,7 +354,7 @@ #. TRANSLATORS: if the sensor supports calibrating different #. * display types, e.g. LCD, LED, Projector msgid "Capabilities" -msgstr "" +msgstr "기능" msgid "There are no supported sensors attached" msgstr "연결된 지원 센서가 없습니다" @@ -353,30 +365,45 @@ #. TRANSLATORS: the user needs to change something on the device msgid "Set the device to the calibrate position and press enter." -msgstr "" +msgstr "보정 위치로 장치를 설정하고 엔터 키를 누르십시오." #. TRANSLATORS: the user needs to change something on the device msgid "Set the device to the surface position and press enter." +msgstr "표면 위치로 장치를 설정하고 엔터 키를 누르십시오." + +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." msgstr "" msgid "Color" msgstr "색상" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" -msgstr "" +msgstr "클라이언트 및 데몬 버전을 나타냅니다" #. TRANSLATORS: command line option msgid "Show the value without any header" -msgstr "" +msgstr "헤더를 뺀 값을 보여줍니다." #. TRANSLATORS: command line option msgid "Filter object properties when displaying" -msgstr "" +msgstr "데이터를 보여줄 때 객체 속성을 따로 보여줍니다" #. TRANSLATORS: command description msgid "Dump all debug data to a file" -msgstr "" +msgstr "모든 디버깅 데이터를 파일로 내보냅니다" #. TRANSLATORS: command description msgid "Gets all the color managed devices" @@ -395,6 +422,10 @@ msgstr "사용할 수 있는 모든 색상 센서를 가져옵니다" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "센서로부터 데이터를 읽어옵니다" @@ -412,15 +443,15 @@ #. TRANSLATORS: command description msgid "Find a device from the device ID" -msgstr "" +msgstr "장치 ID로 장치를 찾습니다" #. TRANSLATORS: command description msgid "Find a device with a given property value" -msgstr "" +msgstr "주어진 속성 값으로 장치를 찾습니다" #. TRANSLATORS: command description msgid "Find a profile from the profile ID" -msgstr "" +msgstr "프로파일 ID로 프로파일을 찾습니다" #. TRANSLATORS: command description msgid "Find a profile by filename" @@ -436,7 +467,7 @@ #. TRANSLATORS: command description msgid "Add a profile to a device that already exists" -msgstr "" +msgstr "이미 존재하는 장치에 프로파일을 추가합니다" #. TRANSLATORS: command description msgid "Makes a profile default for a device" @@ -452,7 +483,7 @@ #. TRANSLATORS: command description msgid "Sets extra properties on the profile" -msgstr "" +msgstr "프로파일에 추가 속성을 설정합니다" #. TRANSLATORS: command description msgid "Sets the device model" @@ -460,7 +491,7 @@ #. TRANSLATORS: command description msgid "Enables or disables the device" -msgstr "" +msgstr "장치를 활성화하거나 비활성화합니다" #. TRANSLATORS: command description msgid "Gets the default profile for a device" @@ -488,62 +519,62 @@ #. TRANSLATORS: command description msgid "Import a profile and install it for the user" -msgstr "" +msgstr "개별 사용자용 프로파일을 가져오고 설치합니다" #. TRANSLATORS: no colord available msgid "No connection to colord:" msgstr "colord가 없습니다:" msgid "Client version:" -msgstr "" +msgstr "클라이언트 버전:" msgid "Daemon version:" -msgstr "" +msgstr "데몬 버전:" msgid "System vendor:" -msgstr "" +msgstr "시스템 제조사:" msgid "System model:" -msgstr "" +msgstr "시스템 모델:" msgid "Default gamma for the display" -msgstr "" +msgstr "디스플레이 기본 감마 값" msgid "" "The default target gamma value for the display. Common values are 1.8, 2.2 " "and 2.4." -msgstr "" +msgstr "디스플레이 장치에 사용할 기본 대상 감마 값입니다. 보통 사용하는 값은 1.8, 2.2, 2.4 입니다." msgid "Default display target whitepoint" -msgstr "" +msgstr "기본 디스플레이 대상 화이트포인트" msgid "" "The default target whitepoint in Kelvin for display calibration, with 0 " "meaning display native. Common values are 6500 for D65 and 5000 for D50." -msgstr "" +msgstr "디스플레이 장치를 보정할 때 사용할 켈빈단위의 기본 대상 화이트포인트 값이며 0 값은 장치 고유 값을 의미합니다. 보통 사용하는 값은 D65에서 6500, D50에서 5000입니다." msgid "Delay between sample intervals" -msgstr "" +msgstr "샘플 간격 지연" msgid "" "This is the delay between setting the sample color and asking the measuring " "instrument to take a sample. It is required because both the graphics driver" " and the display itself introduce latency." -msgstr "" +msgstr "샘플 색상을 설정하고 측정 장치에서 샘플을 채취하도록 요청하는데 걸리는 지연 시간입니다. 그래픽 드라이버와 디스플레이 장치 자체에 레이턴시가 있기 때문에 이 설정값이 필요합니다." msgid "Web service profile upload URI" -msgstr "" +msgstr "프로파일 업로드용 웹 서비스 URI" msgid "" "The URI of the web service that allows the calibration tools to upload a " "specific profile to the Internet." -msgstr "" +msgstr "보정 도구에서 인터넷에 개별 프로파일을 업로드할 수 있는 웹 서비스의 URI입니다." msgid "Compatible with Adobe RGB (1998)" -msgstr "" +msgstr "Adobe RGB (1998) 호환" msgid "This profile is free of known copyright restrictions" -msgstr "" +msgstr "이 프로파일은 저작권 제한으로부터 자유롭습니다" #. TRANSLATORS: a editing space is a profile you use for editing, #. 'SWOP' is also a trademark so don't translate that @@ -552,7 +583,7 @@ "possible colors available on a CMYK color printer. This is a popular choice " "for editing photographs and for use in printing, as all the SWOP colors can " "be reproduced." -msgstr "" +msgstr "이 편집 영역은 SMPTE-240M과 유사하게 설계했으며, CMYK 컬러 프린터로 재현 가능한 모든 색상을 아우릅니다. 사진 편집, 모든 SWOP 색상을 재현할 수 있는 인쇄 용도로 널리 알려진 선택수단 입니다." #. TRANSLATORS: 'Adobe', 'Photoshop', 'Apple' and 'Illustrator' are #. trademarks, @@ -562,7 +593,7 @@ "and Illustrator. As it is based on the original Apple 13\" RGB monitor and " "is similar to sRGB, it should not be used as a display profile or for new " "images." -msgstr "" +msgstr "이 오래된 기존 프로파일은 원래 Adobe에서 Photoshop과 Illustrator에서 사용하려고 만들었습니다. 기존 Apple 13\" RGB 모니터를 기반으로 하며 sRGB와 유사하므로, 디스플레이 프로파일로 사용하거나 새 이미지를 편집할 용도로 사용하면 안됩니다." #. TRANSLATORS: super-saturated is in reference to colors you can't show on a #. PC screen @@ -571,7 +602,7 @@ "suitable for images with highly saturated colors often used in " "advertisements. It is very similar to DonRGB4, but can show super-saturated " "red colors sometimes present in Fujichrome Velvia." -msgstr "" +msgstr "이 편집 영역은 Adobe RGB보다 채도가 높은 색상을 표시할 수 있으며, 광고에 주로 사용하는 고채도 색상으로 표현한 이미지에 적합합니다. DonRGB4와 매우 유사하지만, Fujichrome Velvia에서 초고채도 적색 색상을 보여줄 수 있습니다." #. TRANSLATORS: 'shadow detail' is the number of black colors you can see msgid "" @@ -579,31 +610,31 @@ "less prone to quantisation errors compared to ProPhoto RGB, although more " "shadow detail is preserved. In most instances ProPhoto RGB is probably a " "better choice." -msgstr "" +msgstr "이 편집 영역은 Adobe RGB 보다 채도가 높은 색상을 표시할 수 있습니다. 세부 음영 정보를 보존할 수 있지만, ProPhoto RGB에 비하면 양자화 오류에 덜 취약합니다. 대부분의 경우 ProPhoto RGB는 아마 더 나은 선택일지도 모릅니다." msgid "Blue" -msgstr "" +msgstr "Blue" #. TRANSLATORS: the lookup tables in the GPU map one color to another msgid "" "This test profile is used to make all colors on the screen slightly more " "blue by altering the video card lookup table. This allows the user to check " "the calibration is being applied correctly." -msgstr "" +msgstr "이 시험 프로파일은 비디오 카드 검색 테이블을 대체할 때 화면에 나타난 모든 색상을 거의 시퍼런색으로 만들 때 활용합니다. 사용자는 이 프로파일을 통해 보정 설정을 제대로 적용했는지 확인할 수 있습니다." #. TRANSLATORS: 'Adobe Photoshop' is a trademark, don't translate msgid "" "This is an RGB editing space for use with Adobe Photoshop 5.0 and later. It " "was designed as an output-centric compromise between ColorMatch RGB and " "Adobe RGB and used to be preferred by some photograph printing services." -msgstr "" +msgstr "이 RGB 편집 영역은 Adobe Photoshop 5.0 이상 전용입니다. ColorMatch RGB 와 Adobe RGB 간의 출력 중심 프로파일의 절충안으로 설계했으며 사진 인쇄 서비스에서 종종 선호합니다." #. TRANSLATORS: theoretical in that the profile primaries are not real colors msgid "" "This theoretical profile is designed for use in color experiments. You " "probably don't want to use this profile as a editing space or a display " "profile." -msgstr "" +msgstr "이 이론적 프로파일은 색상 경험에 있어 활용 용도로 설계했습니다. 사용자 여러분은 색상 영역을 편집한다거나 디스플레이 프로파일로서 이 프로파일을 선호하지 않을 것입니다." #. TRANSLATORS: 'Radius' and 'PressView' are trademarks, please don't #. translate @@ -612,10 +643,10 @@ " profile as a display profile or as a editing space as the profile is not " "significantly different to sRGB. You should only need to use this profile if" " viewing images created on a PressView monitor." -msgstr "" +msgstr "이 프로파일은 PressView 모니터용으로 Radius에서 설계했습니다. 이 프로파일을 디스플레이 프로파일 전용으로 활용하거나 프로파일로 활용할 편집 영역 전용으로 활용할 경우 sRGB랑 눈에 띄게 달라지는 건 없습니다. PressView 모니터에서 만든 이미지를 볼 경우에만 이 프로파일 활용이 필요합니다." msgid "Crayon Colors" -msgstr "" +msgstr "크레용 색상" #. TRANSLATORS: 'Crayola' is a trademark, please don't translate, #. also 'named colors' are color swatches with a name, e.g. 'Royal Rose' @@ -623,14 +654,14 @@ "This named color profile contains all the Crayola crayon colors in popular " "use. It is a test profile designed for testing embedding named colors into " "documents." -msgstr "" +msgstr "이 명칭이 붙은 색상 프로파일에는 널리 사용하는 모든 크라욜라 크레용 색상이 들어있습니다. 문서에 이름을 붙인 색상을 넣을 때 시험해볼 목적으로 시험 프로파일을 설계했습니다." #. TRANSLATORS: saturated means vivid bright colors msgid "" "This editing space can display more saturated colors than Adobe RGB and is " "suitable for images with highly saturated colors often used in " "advertisements." -msgstr "" +msgstr "이 편집 영역은 Adobe RGB보다 채도가 높은 색상을 표시할 수 있으며, 광고에 주로 사용하는 고채도 색상으로 표현한 이미지에 적합합니다." #. TRANSLATORS: ECI is a trademark, don't translate msgid "" @@ -638,14 +669,14 @@ "editing space for professional image editing and aims to cover all colors " "that can be printed on printing presses. This is sometimes used as a color " "data exchange format between publishers and printing houses." -msgstr "" +msgstr "이 프로파일은 ECI(유럽 색상 협회)에서 색상 편집 영역으로 추천하며, 인쇄 프레스에서 인쇄할 수 있는 모든 색상취급을 목표로 합니다. 간혹 서적 저자와 인쇄소가 색상 정보를 주고 받을때 사용하는 데이터 형식으로 사용하기도 합니다." #. TRANSLATORS: lightness is a technical word for brightness msgid "" "This profile was designed with a lightness gamma curve which means the " "monitor will have to be also calibrated in the same way. This profile is " "only useful for advanced users and is not recommended for general use." -msgstr "" +msgstr "이 프로파일은 밝기 감마 커브와 함께 설계했는데, 모니터 장치를 동일한 방식으로 보정하겠다는 의미입니다. 이 프로파일은 고급 사용자에게만 적합하며, 일반적인 목적의 사용을 추천하지 않습니다." #. TRANSLATORS: negatives refers to the film on which a negative image is #. stored @@ -653,20 +684,20 @@ "This profile was designed for storing archives of scanned transparency film." " It is suitable for storing images from color negatives, although nowadays " "ProPhoto RGB is a more popular profile for archival." -msgstr "" +msgstr "이 프로파일은 스캔 투명 필름 아카이브를 보관할 목적으로 설계했습니다. 최근에는 ProPhoto RGB 프로파일을 보관 용도로 더 많이 사용하지만 반전 색상 형식으로 이미지를 저장하는데 적합합니다." msgid "FOGRA27L Coated" -msgstr "" +msgstr "FOGRA27L Coated" #. TRANSLATORS: positive as in not a negative image of what's printed msgid "" "This profile is used for positive plate making, printing on paper types 1 " "and 2 (coated or matte), sheetfed offset. This profile set should no longer " "be used for production, use FOGRA39L instead." -msgstr "" +msgstr "이 프로파일은 양극판 제판, 용지 형식 1, 2(광택 또는 무광택), 삽지 옵셋에 인쇄할 때 활용합니다. 제조 공정에서 이 프로파일을 더 이상 활용하지 마시고, FOGRA39L를 활용하십시오." msgid "FOGRA28L Web Coated" -msgstr "" +msgstr "FOGRA28L Web Coated" #. TRANSLATORS: paper grade 3 is just a description meaning "not very white", #. LCW stands for Light Weight Coated @@ -674,10 +705,10 @@ "This profile is used for positive plate making, printing on paper type 3 " "(LWC), webfed offset. This profile should no longer be used for production, " "use FOGRA45 instead." -msgstr "" +msgstr "이 프로파일은 양극판 제판, 용지 형식 3(LW), 윤전 인쇄 옵셋 인쇄 용도로 활용합니다. 제조 공정에서 이 프로파일을 더 이상 활용하지 마시고, FOGRA45를 활용하십시오." msgid "FOGRA29L Uncoated" -msgstr "" +msgstr "FOGRA29L Uncoated" #. TRANSLATORS: yellowish is in reference to the paper color, i.e. not pure #. white @@ -685,19 +716,19 @@ "This profile is used for positive plate making, printing on paper type 4 " "(uncoated white), sheetfed offset. This profile should no longer be used for" " production, use FOGRA47 instead." -msgstr "" +msgstr "이 프로파일은 양극판 제판, 용지 형식 4(무광택 백색), 삽지 옵셋 인쇄시 활용합니다. 제조 공정에서 이 프로파일을 더 이상 활용하지 마시고, FOGRA47을 활용하십시오." msgid "FOGRA30L Uncoated Yellowish" -msgstr "" +msgstr "FOGRA30L Uncoated Yellowish" #. TRANSLATORS: uncoated means "without expensive glossy coating" msgid "" "This profile is used for positive plate making, printing on paper type 5 " "(uncoated yellowish), sheetfed offset." -msgstr "" +msgstr "이 프로파일은 양극판 제판, 용지 형식 5(무광택 황색), 삽지 옵셋 인쇄시 활용합니다." msgid "FOGRA39L Coated" -msgstr "" +msgstr "FOGRA39L Coated" #. TRANSLATORS: coated refers to the high quality paper covering making the #. paper @@ -706,47 +737,47 @@ "This profile is used for printing on paper types 1 and 2 (coated or matte), " "sheetfed offset. This profile is not significantly different from U.S. " "GRACoL 2006 (TR 006)." -msgstr "" +msgstr "이 프로파일은 용지 형식 1, 2(광택 또는 무광택), 삽지 옵셋에 인쇄할 때 활용합니다. 이 프로파일은 U.S. GRACoL 2006 (TR 006)과 큰 차이가 없습니다." msgid "FOGRA40L SC Paper" -msgstr "" +msgstr "FOGRA40L SC Paper" #. TRANSLATORS: supercalendered means "super smoothed and thin" msgid "" "This profile is used for printing on SC (supercalendered) paper, webfed " "offset. There is no known U.S. equivalent." -msgstr "" +msgstr "이 프로파일은 SC(강광택) 용지, 윤전 옵셋에서 인쇄할 때 활용합니다. 알려진 미국 색상 프로파일 중 동일한 프로파일은 없습니다." msgid "FOGRA45L Lightweight Coated" -msgstr "" +msgstr "FOGRA45L Lightweight Coated" #. TRANSLATORS: ISO is a trademark msgid "" "This ISO 12647-2:2004 compliant profile is used for printing on improved " "light-weight coated (LWC) paper for 60 l/cm heatset web offset printing. It " "replaces FOGRA28L." -msgstr "" +msgstr "ISO 12647-2:2004 규격 준수 프로파일은 60 l/cm 히트셋 윤전 인쇄용 개선 경량 광택(LWC) 용지 인쇄시 활용합니다. FOGRA28L을 대체합니다." msgid "FOGRA47L Uncoated" -msgstr "" +msgstr "FOGRA47L Uncoated" #. TRANSLATORS: gsm stands for "grams per square meter" msgid "" "This ISO 12647-2 compliant profile is used for printing on 115 gsm uncoated " "white (paper type 4) for 60 l/cm sheetfed offset printing." -msgstr "" +msgstr "ISO 12647-2 규격 준수 프로파일은 60 l/cm 삽지 옵셋 인쇄시 115 gsm 무광 백색 용지(용지 형식 4)에 인쇄할 때 활용합니다." msgid "GRACoL TR006 Coated" -msgstr "" +msgstr "GRACoL TR006 Coated" #. TRANSLATORS: coated = smooth and expensive msgid "" "This profile is used for printing on U.S. grade 1 and 2 coated paper, " "sheetfed offset and gravure. It is the U.S. equivalent of FOGRA39." -msgstr "" +msgstr "이 프로파일은 U.S. 1,2 등급 광택 용지, 삽지 옵셋, 그라비어 인쇄시 활용합니다. FOGRA39 미국 색상 표준과 일치합니다." msgid "IFRA26S 2004 Newsprint" -msgstr "" +msgstr "IFRA26S 2004 Newsprint" #. TRANSLATORS: TVI stands for 'tone value increase' and is another name for #. dot gain, coldset means letting the ink dry without heating it @@ -756,7 +787,7 @@ "compliant profile designed for a printing press exhibiting 26% TVI (dot " "gain). It is recommended by WAN-IFRA for coldset printing on newsprint " "worldwide." -msgstr "" +msgstr "이 프로파일은 신문 인쇄시 활용하며, 인쇄 공정상 26% TVI(도트 게인)을 나타내는 ISO12647-3:2005 규약 준수 프로파일입니다. 전세계에서 신문을 인쇄할 때 콜드셋 인쇄를 목적으로 WAN-IFRA에서 추천합니다." #. TRANSLATORS: A little joke: Color Geeks say that NTSC stands for 'Never The #. Same Color' as it's really a poor choice compared to sRGB @@ -764,14 +795,14 @@ "This profile defines the range of colors used with the NTSC video standard. " "It is an obsolete standard that has been replaced by SMTE-C. You should only" " use this profile to decode archived video." -msgstr "" +msgstr "이 프로파일은 NTSC 비디오 표준에서 사용하는 색상 범위를 정의합니다. SMTE-C로 대체되어 오래된채로 방치된 표준입니다. 동영상 기록물을 디코딩할 때만 이 프로파일을 활용해야합니다." #. TRANSLATORS: Please don't translate PAL or SECAM msgid "" "This profile defines the range of colors used with the PAL and SECAM video " "standards and is very similar to sRGB. You should only use this profile to " "encode or decode video." -msgstr "" +msgstr "이 프로파일에서는 PAL 과 SECAM 비디오 표준에서 활용하는 색상 범위를 정의하며 sRGB와 거의 유사합니다. 이 프로파일은 동영상을 인코딩 또는 디코딩할 경우에만 활용해야 합니다." #. TRANSLATORS: Please don't translate 'RGB' or 'RAW' msgid "" @@ -779,30 +810,30 @@ "display a very large range of colors and is used by many photographers for " "rendering, editing and archiving RAW images. Unless you are working with 16 " "bits per channel precision, you may see color banding when editing images." -msgstr "" +msgstr "애초에 Eastman Kodak에서 설계했고 ROMM RGB라고도 하는 이 프로파일은 상당히 넓은 영역의 색상을 표현할 수 있으며 대부분의 사진사들이 RAW 이미지를 표현하고 편집하고 저장하는데 활용합니다. 16비트 채널 정밀도로 작업하지 않는 이상, 이미지를 편집할 때 색 띠 현상을 관찰할 수 있습니다." #. TRANSLATORS: ITU-R is a standards body msgid "" "ITU-R recommendation BT.709 is a high-definition television standard that " "was first approved in 1990. The Rec. 709 profile uses the same range of " "colors as sRGB although the luminance curve is different." -msgstr "" +msgstr "ITU-R 권고안 BT.709는 1990년 처음 상정한 고해상도 텔레비전 표준입니다. Rec. 709 프로파일은 sRGB와 휘도 커브가 다르지만 동일한 영역의 색상을 활용합니다." #. TRANSLATORS: studio recording means 'shows you'll see on TV' msgid "" "This is the current standard used by North America and Japan for studio " "recording. You should only use this profile to encode or decode video." -msgstr "" +msgstr "이는 북아메리카, 일본에서 스튜디오 녹화시 활용하는 표준안입니다. 동영상을 인코딩하거나 디코딩할 경우에만 이 프로파일을 활용해야합니다." msgid "SNAP TR002 Newsprint" -msgstr "" +msgstr "SNAP TR002 Newsprint" #. TRANSLATORS: CGATS is a trademark #, no-c-format msgid "" "This is an ANSI CGATS/SNAP TR 002-2007 based profile for printing on " "newsprint in the U.S., coldset offset. The TVI (dot gain) is 26%." -msgstr "" +msgstr "미국에서 콜드셋 옵셋으로 신문을 인쇄할 때 활용하는 ANSI CGATS/SNAP TR 002-2007 기반 프로파일입니다. TVI(도트 게인)은 26%입니다." #. TRANSLATORS: Trinitron is a trademark, 'untagged' means an image with an #. unspecified color profile @@ -812,40 +843,40 @@ "and used in HDTV. Most uncalibrated displays are able to display most of the" " colors available in sRGB, although this profile is sometimes a poor choice " "for printing." -msgstr "" +msgstr "이 범용 프로파일은 휴렛 팩커드와 마이크로소프트에서 설계했으며 태깅하지 않은 인터넷 RGB 색상용 기본 프로파일로 존재하고, HDTV에서 활용합니다. 대부분의 보정하지 않은 디스플레이 장치에서는 이 프로파일이 간혹 인쇄에 적합하지 않은 선택이겠지만, sRGB 영역의 대부분의 색상을 표현할 수 있습니다." msgid "Swapped Red and Green" -msgstr "" +msgstr "Swapped Red and Green" #. TRANSLATORS: channels refer to the RGB values in an image msgid "" "This test profile swaps the red and green channels and is useful as a visual" " check that profiles are being applied correctly. If this profile is applied" " twice, the image looks unchanged." -msgstr "" +msgstr "이 시험 프로파일은 적, 녹 채널을 서로 도치하며, 프로파일을 올바로 적용했는지 눈으로 확인할 때 유용합니다. 이 프로파일을 두번 적용하면 이미지 형태는 원 상태로 보입니다." msgid "SWOP TR003 Coated" -msgstr "" +msgstr "SWOP TR003 Coated" #. TRANSLATORS: FOGRA is a trademark msgid "" "This profile is used for printing on U.S. grade 3 coated paper, sheetfed " "offset and gravure. It is used for high quality magazine printing with white" " paper." -msgstr "" +msgstr "이 프로파일은 미 3등급 광택용지, 삽지 옵셋, 그라비어 용지에 인쇄할 때 사용합니다. 백지에 고급 잡지 인쇄를 할 때 활용합니다." msgid "SWOP TR005 Coated" -msgstr "" +msgstr "SWOP TR005 Coated" #. TRANSLATORS: FOGRA is a trademark msgid "" "This profile is used for printing on U.S. grade 5 coated paper, sheetfed " "offset and gravure. It is use for standard magazine printing with yellowish " "paper." -msgstr "" +msgstr "이 프로파일은 미 5등급 광택용지, 삽지 옵셋, 그라비어 용지에 인쇄할 때 사용합니다. 누런 종이에 표준 잡지 인쇄를 할 때 활용합니다." msgid "Wide Gamut RGB" -msgstr "" +msgstr "광색역 RGB" #. TRANSLATORS: 'Adobe Systems' is a trademark, don't translate that msgid "" @@ -854,17 +885,17 @@ "recorders and can define many colors that cannot be displayed on a computer " "screen. Unless you are working with 16 bits per channel precision, you may " "see color banding when editing images." -msgstr "" +msgstr "이 편집 영역은 Adobe RGB보다 더 많은 색상을 잡을 수 있도록 Adobe Systems에서 설계했습니다. 이 프로파일은 동영상 녹화 장치와 같은 장치에서 출력할 때 사용하며, 컴퓨터 화면에 나타낼 수 없는 더 많은 색상을 정의할 수 있습니다. 채널 정밀도를 16 비트로 설정하여 작업하는 이상 이미지를 편집할 때 색 띠 현상을 관찰할 수 있습니다." msgid "X11 Colors" -msgstr "" +msgstr "X11 색상" #. TRANSLATORS: A 'named color profile' contains a list of color swatches that #. look the same on all computer screens msgid "" "This named color profile contains all the colors defined by X11, assuming " "the source colors were supposed to be sRGB." -msgstr "" +msgstr "이 이름이 붙은 색상 프로파일에는 X11에서 원본 색상을 sRGB로 가정하여 정의한 모든 색상이 들어있습니다." #. SECURITY: #. - Normal users should not have to authenticate to add devices @@ -965,7 +996,7 @@ #. TRANSLATORS: exit straight away, used for automatic profiling msgid "Create a dummy sensor for testing" -msgstr "" +msgstr "시험용 모형 센서 만들기" msgid "Color Management D-Bus Service" msgstr "색상 관리 D-Bus 서비스" diff -Nru colord-1.2.12/po/lv.po colord-1.3.2/po/lv.po --- colord-1.2.12/po/lv.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/lv.po 2015-12-02 10:29:59.000000000 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Latvian (http://www.transifex.com/projects/p/colord/language/lv/)\n" +"Language-Team: Latvian (http://www.transifex.com/hughsie/colord/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -267,6 +267,18 @@ msgid "Calibration" msgstr "Kalibrācija" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -359,9 +371,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Iestatiet ierīci uz virsmas pozīciju un spiediet enter taustiņu." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Krāsa" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Rādīt klienta un dēmona versijas" @@ -395,6 +422,10 @@ msgstr "Saņem visu pieejamo krāsu sensorus" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Saņem lasījumu no sensora" diff -Nru colord-1.2.12/po/nb_NO.po colord-1.3.2/po/nb_NO.po --- colord-1.2.12/po/nb_NO.po 2015-08-19 14:08:35.000000000 +0000 +++ colord-1.3.2/po/nb_NO.po 2015-12-02 10:29:59.000000000 +0000 @@ -10,9 +10,9 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-19 15:08+0100\n" -"PO-Revision-Date: 2015-07-21 09:55+0000\n" -"Last-Translator: Torstein Husebø \n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" +"Last-Translator: Richard Hughes \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/hughsie/colord/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -269,6 +269,18 @@ msgid "Calibration" msgstr "Kalibrering" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -361,9 +373,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Sett enheten i overflateposisjon og trykk enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Farge" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Vis klient- og nisseversjon" @@ -397,6 +424,10 @@ msgstr "Hent alle tilgjengelige fargesensorer" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Hent en lesing fra en sensor" diff -Nru colord-1.2.12/po/nb.po colord-1.3.2/po/nb.po --- colord-1.2.12/po/nb.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/nb.po 2015-12-02 10:29:59.000000000 +0000 @@ -12,10 +12,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/colord/language/nb/)\n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/hughsie/colord/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -271,6 +271,18 @@ msgid "Calibration" msgstr "Kalibrering" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -363,9 +375,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Sett enheten i overflateposisjon og trykk enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Farge" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Vis klient- og nisseversjon" @@ -399,6 +426,10 @@ msgstr "Hent alle tilgjengelige fargesensorer" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Hent en lesing fra en sensor" diff -Nru colord-1.2.12/po/nl.po colord-1.3.2/po/nl.po --- colord-1.2.12/po/nl.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/nl.po 2015-12-02 10:29:59.000000000 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/colord/language/nl/)\n" +"Language-Team: Dutch (http://www.transifex.com/hughsie/colord/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -267,6 +267,18 @@ msgid "Calibration" msgstr "" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -359,9 +371,24 @@ msgid "Set the device to the surface position and press enter." msgstr "" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Kleur" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "" @@ -395,6 +422,10 @@ msgstr "Toont alle beschikbare kleur-sensoren" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Toont een aflezing van een sensor" diff -Nru colord-1.2.12/po/pl.po colord-1.3.2/po/pl.po --- colord-1.2.12/po/pl.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/pl.po 2015-12-02 10:29:59.000000000 +0000 @@ -4,16 +4,16 @@ # # Translators: # POPularMAN, 2013 -# Piotr Drąg , 2011-2014 +# Piotr Drąg , 2011-2015 # POPularMAN, 2013 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Polish (http://www.transifex.com/projects/p/colord/language/pl/)\n" +"Language-Team: Polish (http://www.transifex.com/hughsie/colord/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,7 +39,7 @@ #. TRANSLATORS: this is a command alias #, c-format msgid "Alias to %s" -msgstr "Alias do %s" +msgstr "Alias do „%s”" msgid "Command not found, valid commands are:" msgstr "Nie odnaleziono polecenia, prawidłowe polecenia to:" @@ -122,7 +122,7 @@ #. TRANSLATORS: this is the profile creation date strftime format msgid "%B %e %Y, %I:%M:%S %p" -msgstr "%e %B %Y, %H:%M:%S" +msgstr "%e %B %Y, %H∶%M∶%S" #. TRANSLATORS: profile owner #. TRANSLATORS: profile UID @@ -269,6 +269,18 @@ msgid "Calibration" msgstr "Kalibracja" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -361,9 +373,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Proszę ustawić urządzenie w pozycji powierzchni i nacisnąć klawisz Enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Kolor" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Wyświetla wersje klienta i usługi" @@ -397,6 +424,10 @@ msgstr "Uzyskuje wszystkie dostępne czujniki kolorów" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Uzyskuje odczyt z czujnika" diff -Nru colord-1.2.12/po/pt_BR.po colord-1.3.2/po/pt_BR.po --- colord-1.2.12/po/pt_BR.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/pt_BR.po 2016-03-21 11:47:05.000000000 +0000 @@ -6,15 +6,16 @@ # Enrico Nicoletto , 2013 # Farid Abdelnour , 2013 # Farid Abdelnour , 2013 -# Rafael Ferreira , 2012-2014 +# Rafael Fontenelle , 2012-2014 +# Rafael Fontenelle , 2016 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" -"Last-Translator: Richard Hughes \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/colord/language/pt_BR/)\n" +"POT-Creation-Date: 2016-03-21 11:47+0000\n" +"PO-Revision-Date: 2016-02-25 06:31+0000\n" +"Last-Translator: Rafael Fontenelle \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/hughsie/colord/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -119,7 +120,7 @@ #. TRANSLATORS: command description msgid "Create a CCMX from reference and measurement data" -msgstr "" +msgstr "Cria um CCMX a partir dos dados de referência e medidas" #. TRANSLATORS: this is the profile creation date strftime format msgid "%B %e %Y, %I:%M:%S %p" @@ -270,6 +271,18 @@ msgid "Calibration" msgstr "Calibração" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "Calibração escura" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "Calibração de irradiância" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "Espectral" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -362,9 +375,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Defina o dispositivo para posição de superfície e pressione enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "Coloque o dispositivo em um lugar escuro e pressione enter." + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "Calibre com uma fonte de luz de 3200K." + +msgid "Put the device on the color to be measured and press enter." +msgstr "Coloque o dispositivo na cor a ser medida e pressione enter." + msgid "Color" msgstr "Cor" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "Nenhuma capacidade espectral" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Mostrar versões de cliente e daemon" @@ -398,6 +426,10 @@ msgstr "Adquire todos sensores de cor disponíveis" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "Obtém uma leitura espectral a partir um sensor" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Adquire uma leitura de um sensor" diff -Nru colord-1.2.12/po/pt_PT.po colord-1.3.2/po/pt_PT.po --- colord-1.2.12/po/pt_PT.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/pt_PT.po 2015-12-02 10:29:59.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bruno Queiros , 2013-2014 +# Bruno Queiros , 2013-2015 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/colord/language/pt_PT/)\n" +"Language-Team: Portuguese (Portugal) (http://www.transifex.com/hughsie/colord/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,7 +24,7 @@ #. TRANSLATORS: program name msgid "ICC profile creation program" -msgstr "" +msgstr "Programa de criação de perfil ICC" #. TRANSLATORS: the user didn't read the man page msgid "Failed to parse arguments" @@ -72,7 +72,7 @@ #. TRANSLATORS: command description msgid "Sets the copyright string" -msgstr "" +msgstr "Configura a string do copyright" #. TRANSLATORS: command description msgid "Sets the description string" @@ -267,6 +267,18 @@ msgid "Calibration" msgstr "Calibração" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -337,7 +349,7 @@ #. TRANSLATORS: if the sensor is locked msgid "Locked" -msgstr "" +msgstr "Trancado" #. TRANSLATORS: if the sensor supports calibrating different #. * display types, e.g. LCD, LED, Projector @@ -359,9 +371,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Configurar o dispositivo para a posição de superfície e pressione enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Cor" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Mostrar versões do cliente e do daemon" @@ -395,6 +422,10 @@ msgstr "" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Obtém uma leitura de um sensor" @@ -656,7 +687,7 @@ msgstr "" msgid "FOGRA27L Coated" -msgstr "" +msgstr "FOGRA27L Coated" #. TRANSLATORS: positive as in not a negative image of what's printed msgid "" @@ -666,7 +697,7 @@ msgstr "" msgid "FOGRA28L Web Coated" -msgstr "" +msgstr "FOGRA28L Web Coated" #. TRANSLATORS: paper grade 3 is just a description meaning "not very white", #. LCW stands for Light Weight Coated @@ -677,7 +708,7 @@ msgstr "" msgid "FOGRA29L Uncoated" -msgstr "" +msgstr "FOGRA29L Uncoated" #. TRANSLATORS: yellowish is in reference to the paper color, i.e. not pure #. white @@ -688,7 +719,7 @@ msgstr "" msgid "FOGRA30L Uncoated Yellowish" -msgstr "" +msgstr "FOGRA30L Uncoated Yellowish" #. TRANSLATORS: uncoated means "without expensive glossy coating" msgid "" @@ -697,7 +728,7 @@ msgstr "" msgid "FOGRA39L Coated" -msgstr "" +msgstr "FOGRA39L Coated" #. TRANSLATORS: coated refers to the high quality paper covering making the #. paper @@ -709,7 +740,7 @@ msgstr "" msgid "FOGRA40L SC Paper" -msgstr "" +msgstr "FOGRA40L SC Paper" #. TRANSLATORS: supercalendered means "super smoothed and thin" msgid "" @@ -718,7 +749,7 @@ msgstr "" msgid "FOGRA45L Lightweight Coated" -msgstr "" +msgstr "FOGRA45L Lightweight Coated" #. TRANSLATORS: ISO is a trademark msgid "" @@ -728,7 +759,7 @@ msgstr "" msgid "FOGRA47L Uncoated" -msgstr "" +msgstr "FOGRA47L Uncoated" #. TRANSLATORS: gsm stands for "grams per square meter" msgid "" @@ -737,7 +768,7 @@ msgstr "" msgid "GRACoL TR006 Coated" -msgstr "" +msgstr "GRACoL TR006 Coated" #. TRANSLATORS: coated = smooth and expensive msgid "" @@ -746,7 +777,7 @@ msgstr "" msgid "IFRA26S 2004 Newsprint" -msgstr "" +msgstr "IFRA26S 2004 Newsprint" #. TRANSLATORS: TVI stands for 'tone value increase' and is another name for #. dot gain, coldset means letting the ink dry without heating it @@ -835,7 +866,7 @@ msgstr "" msgid "SWOP TR005 Coated" -msgstr "" +msgstr "SWOP TR005 Coated" #. TRANSLATORS: FOGRA is a trademark msgid "" @@ -845,7 +876,7 @@ msgstr "" msgid "Wide Gamut RGB" -msgstr "" +msgstr "Wide Gamut RGB" #. TRANSLATORS: 'Adobe Systems' is a trademark, don't translate that msgid "" diff -Nru colord-1.2.12/po/ro.po colord-1.3.2/po/ro.po --- colord-1.2.12/po/ro.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/ro.po 2015-12-02 10:29:59.000000000 +0000 @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Romanian (http://www.transifex.com/projects/p/colord/language/ro/)\n" +"Language-Team: Romanian (http://www.transifex.com/hughsie/colord/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -268,6 +268,18 @@ msgid "Calibration" msgstr "" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -360,9 +372,24 @@ msgid "Set the device to the surface position and press enter." msgstr "" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Culoare" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "" @@ -396,6 +423,10 @@ msgstr "Obține toți senzorii de culoare disponibili" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Obține o citire de la un senzor" diff -Nru colord-1.2.12/po/ru.po colord-1.3.2/po/ru.po --- colord-1.2.12/po/ru.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/ru.po 2015-12-02 10:29:59.000000000 +0000 @@ -11,15 +11,15 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 20:31+0000\n" -"Last-Translator: Serge Vylekzhanin \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/colord/language/ru/)\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" +"Last-Translator: Richard Hughes \n" +"Language-Team: Russian (http://www.transifex.com/hughsie/colord/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #. TRANSLATORS: command line option msgid "Profile to create" @@ -270,6 +270,18 @@ msgid "Calibration" msgstr "Калибровка" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -362,9 +374,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Установите устройство на место на поверхности и нажмите Enter" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Цвет" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Показать версии клиента и фоновой службы" @@ -398,6 +425,10 @@ msgstr "Получает все доступные цветовые датчики" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Считывает данные c датчика" diff -Nru colord-1.2.12/po/sk.po colord-1.3.2/po/sk.po --- colord-1.2.12/po/sk.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/sk.po 2015-12-02 10:29:59.000000000 +0000 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dušan Kazik , 2015 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Slovak (http://www.transifex.com/projects/p/colord/language/sk/)\n" +"Language-Team: Slovak (http://www.transifex.com/hughsie/colord/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -124,7 +125,7 @@ #. TRANSLATORS: profile owner #. TRANSLATORS: profile UID msgid "Owner" -msgstr "" +msgstr "Vlastník" #. TRANSLATORS: the internal DBus path msgid "Object Path" @@ -135,12 +136,12 @@ #. TRANSLATORS: the device format, e.g. #. * ColorModel.OutputMode.OutputResolution msgid "Format" -msgstr "" +msgstr "Formát" #. TRANSLATORS: the profile title, e.g. #. * "ColorMunki, HP Deskjet d1300 Series" msgid "Title" -msgstr "" +msgstr "Názov" #. TRANSLATORS: the profile qualifier, e.g. RGB.Plain.300dpi msgid "Qualifier" @@ -150,7 +151,7 @@ #. TRANSLATORS: the device type, e.g. "printer" #. TRANSLATORS: the sensor type, e.g. 'output' msgid "Type" -msgstr "" +msgstr "Typ" #. TRANSLATORS: the profile colorspace, e.g. 'rgb' #. TRANSLATORS: the device colorspace, e.g. "rgb" @@ -163,7 +164,7 @@ #. TRANSLATORS: if the profile has a Video Card Gamma Table lookup msgid "Gamma Table" -msgstr "" +msgstr "Tabuľka gama" #. TRANSLATORS: if the profile is installed for all users msgid "System Wide" @@ -183,7 +184,7 @@ msgstr "Metaúdaje" msgid "Warning" -msgstr "" +msgstr "Upozornenie" #. TRANSLATORS: this is the time the device was registered #. * with colord, and probably is the same as the system startup @@ -264,6 +265,18 @@ #. TRANSLATORS: this is the display technology msgid "Calibration" +msgstr "Kalibrácia" + +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" msgstr "" #. TRANSLATORS: this is the display technology, @@ -358,9 +371,24 @@ msgid "Set the device to the surface position and press enter." msgstr "" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Farba" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "" @@ -394,6 +422,10 @@ msgstr "Získa všetky dostupné farebné senzory" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Získa čítanie zo senzora" @@ -494,19 +526,19 @@ msgstr "Nie je spojenie s colord:" msgid "Client version:" -msgstr "" +msgstr "Verzia klienta:" msgid "Daemon version:" -msgstr "" +msgstr "Verzia démona:" msgid "System vendor:" -msgstr "" +msgstr "Výrobca systému:" msgid "System model:" -msgstr "" +msgstr "Model systému:" msgid "Default gamma for the display" -msgstr "" +msgstr "Predvolená gama pre displej" msgid "" "The default target gamma value for the display. Common values are 1.8, 2.2 " @@ -542,7 +574,7 @@ msgstr "" msgid "This profile is free of known copyright restrictions" -msgstr "" +msgstr "Tento profil neobsahuje žiadne obmedzenia autorských práv" #. TRANSLATORS: a editing space is a profile you use for editing, #. 'SWOP' is also a trademark so don't translate that @@ -614,7 +646,7 @@ msgstr "" msgid "Crayon Colors" -msgstr "" +msgstr "Pastelové farby" #. TRANSLATORS: 'Crayola' is a trademark, please don't translate, #. also 'named colors' are color swatches with a name, e.g. 'Royal Rose' diff -Nru colord-1.2.12/po/sl.po colord-1.3.2/po/sl.po --- colord-1.2.12/po/sl.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/sl.po 2015-12-02 10:29:59.000000000 +0000 @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Slovenian (http://www.transifex.com/projects/p/colord/language/sl/)\n" +"Language-Team: Slovenian (http://www.transifex.com/hughsie/colord/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -268,6 +268,18 @@ msgid "Calibration" msgstr "Umerjanje" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -360,9 +372,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Postavite napravo na mesto površine in pritisnite vnašalko." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Barva" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Pokaži različici odjemalca in prikritega procesa" @@ -396,6 +423,10 @@ msgstr "Pridobi vsa barvna tipala, ki so na voljo" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Pridobi meritev tipala" diff -Nru colord-1.2.12/po/sr.po colord-1.3.2/po/sr.po --- colord-1.2.12/po/sr.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/sr.po 2016-03-21 11:47:05.000000000 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" -"Last-Translator: Richard Hughes \n" -"Language-Team: Serbian (http://www.transifex.com/projects/p/colord/language/sr/)\n" +"POT-Creation-Date: 2016-03-21 11:47+0000\n" +"PO-Revision-Date: 2015-12-21 19:58+0000\n" +"Last-Translator: Мирослав Николић \n" +"Language-Team: Serbian (http://www.transifex.com/hughsie/colord/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -267,6 +267,18 @@ msgid "Calibration" msgstr "Калибрација" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "Тамна калибрација" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "Сјајна калибрација" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "Спектар" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -359,9 +371,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Подесите уређај на положај површине и притисните унеси." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "Поставите уређај на тамно место и притисните унеси." + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "Калибрирајте са 3200K извора светлости." + +msgid "Put the device on the color to be measured and press enter." +msgstr "Поставите уређај над бојом која ће се мерити и притисните унеси." + msgid "Color" msgstr "Боја" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "Нема спектарне могућности" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Приказује издања програма и позадинца" @@ -395,6 +422,10 @@ msgstr "Добавља све сензоре доступне боје" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "Добавља спектарно читање са сензора" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Добавља читање са сензора" diff -Nru colord-1.2.12/po/sv.po colord-1.3.2/po/sv.po --- colord-1.2.12/po/sv.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/sv.po 2015-12-02 10:29:59.000000000 +0000 @@ -5,14 +5,15 @@ # Translators: # Daniel Nylander , 2011 # sebras , 2015 +# sebras , 2015 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" -"Last-Translator: Josef Andersson \n" -"Language-Team: Swedish (http://www.transifex.com/projects/p/colord/language/sv/)\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" +"Last-Translator: Richard Hughes \n" +"Language-Team: Swedish (http://www.transifex.com/hughsie/colord/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -268,6 +269,18 @@ msgid "Calibration" msgstr "Kalibrering" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -360,9 +373,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Ställ in enheten på ytpositionen och tryck retur." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Färg" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Visa klient- och demonversioner" @@ -396,6 +424,10 @@ msgstr "Hämtar alla tillgängliga färgsensorer" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Hämtar en avläsning från en sensor" diff -Nru colord-1.2.12/po/tr.po colord-1.3.2/po/tr.po --- colord-1.2.12/po/tr.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/tr.po 2015-12-02 10:29:59.000000000 +0000 @@ -11,10 +11,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Turkish (http://www.transifex.com/projects/p/colord/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/hughsie/colord/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -270,6 +270,18 @@ msgid "Calibration" msgstr "Kalibrasyon" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -362,9 +374,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Konumu yüzeye çıkarmak için aygıtı ayarlayın ve enter tuşuna basın." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Renk" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "İstemci ve artalan sürecinin sürümlerini göster" @@ -398,6 +425,10 @@ msgstr "Tüm kullanılabilir renk algılayıcılarını alır" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Bir algılayıcıdan okuma alır" diff -Nru colord-1.2.12/po/uk.po colord-1.3.2/po/uk.po --- colord-1.2.12/po/uk.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/uk.po 2015-12-02 10:29:59.000000000 +0000 @@ -11,10 +11,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" -"Last-Translator: Yuri Chornoivan \n" -"Language-Team: Ukrainian (http://www.transifex.com/projects/p/colord/language/uk/)\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" +"Last-Translator: Richard Hughes \n" +"Language-Team: Ukrainian (http://www.transifex.com/hughsie/colord/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -270,6 +270,18 @@ msgid "Calibration" msgstr "Калібрування" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -362,9 +374,24 @@ msgid "Set the device to the surface position and press enter." msgstr "Встановіть пристрій у позицію на поверхні і натисніть Enter." +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "Колір" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "Вивести дані щодо версій клієнтської частини і фонової служби" @@ -398,6 +425,10 @@ msgstr "Отримати список всіх доступний датчиків кольорів" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "Виконати спробу читання даних з пристрою" diff -Nru colord-1.2.12/po/zh_CN.po colord-1.3.2/po/zh_CN.po --- colord-1.2.12/po/zh_CN.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/zh_CN.po 2015-12-02 10:29:59.000000000 +0000 @@ -3,15 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Mingye Wang , 2015 +# Tiansworld , 2014 +# Tiansworld , 2014 # Tommy He , 2012 msgid "" msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/colord/language/zh_CN/)\n" +"Language-Team: Chinese (China) (http://www.transifex.com/hughsie/colord/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -48,11 +51,11 @@ #. TRANSLATORS: command line option msgid "The locale to use when setting localized text" -msgstr "" +msgstr "设置本地化内容时要使用的区域设置" #. TRANSLATORS: command description msgid "Generate the VCGT calibration of a given size" -msgstr "" +msgstr "生成给定尺寸的 VCGT 校正" #. TRANSLATORS: command description msgid "Clear any metadata in the profile" @@ -92,11 +95,11 @@ #. TRANSLATORS: command description msgid "Set the ICC profile version" -msgstr "" +msgstr "设置 ICC 配置文件版本" #. TRANSLATORS: command description msgid "Export the tag data" -msgstr "" +msgstr "导出标记数据" #. TRANSLATORS: program name msgid "Color Management" @@ -104,19 +107,19 @@ #. TRANSLATORS: program name msgid "ICC profile dump program" -msgstr "" +msgstr "ICC 文件转储程序" #. TRANSLATORS: command description msgid "Create a CMF from CSV data" -msgstr "" +msgstr "从 CSV 数据中创建 CMF" #. TRANSLATORS: command description msgid "Create a spectrum from CSV data" -msgstr "" +msgstr "从 CSV 数据创建色谱" #. TRANSLATORS: command description msgid "Create a CCMX from reference and measurement data" -msgstr "" +msgstr "根据参考数据与测量结果制作 CCMX" #. TRANSLATORS: this is the profile creation date strftime format msgid "%B %e %Y, %I:%M:%S %p" @@ -168,7 +171,7 @@ #. TRANSLATORS: if the profile is installed for all users msgid "System Wide" -msgstr "" +msgstr "系统范围" #. TRANSLATORS: profile filename msgid "Filename" @@ -184,7 +187,7 @@ msgstr "元数据" msgid "Warning" -msgstr "" +msgstr "警告" #. TRANSLATORS: this is the time the device was registered #. * with colord, and probably is the same as the system startup @@ -199,12 +202,12 @@ #. TRANSLATORS: the device enabled state msgid "Enabled" -msgstr "" +msgstr "已启用" #. TRANSLATORS: if the device is embedded into the computer and #. * cannot be removed msgid "Embedded" -msgstr "" +msgstr "已嵌入" #. TRANSLATORS: the device model #. TRANSLATORS: sensor model @@ -217,7 +220,7 @@ msgstr "厂商" msgid "Inhibitors" -msgstr "" +msgstr "抑制剂" #. TRANSLATORS: the device serial number msgid "Serial" @@ -265,55 +268,67 @@ #. TRANSLATORS: this is the display technology msgid "Calibration" +msgstr "校正" + +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" msgstr "" #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" -msgstr "" +msgstr "通用 LCD" #. TRANSLATORS: this is the display technology where #. * LED stands for 'Light Emitted Diode' msgid "LED Generic" -msgstr "" +msgstr "通用 LED" #. TRANSLATORS: this is the display technology, #. * sometimes called PDP displays. See #. * http://en.wikipedia.org/wiki/Plasma_display msgid "Plasma" -msgstr "" +msgstr "等离子屏幕" #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' #. * and CCFL stands for 'Cold Cathode Fluorescent Lamp' msgid "LCD CCFL" -msgstr "" +msgstr "LCD CCFL" #. TRANSLATORS: this is the display technology where #. * RGB stands for 'Red Green Blue' and LED stands for #. * 'Light Emitted Diode' msgid "LCD RGB LED" -msgstr "" +msgstr "LCD RGB LED" #. TRANSLATORS: this is the display technology, where #. * wide gamut means the display primaries are much #. * better than normal consumer monitors msgid "Wide Gamut LCD CCFL" -msgstr "" +msgstr "宽 Gamut LCD CCFL" #. TRANSLATORS: this is the display technology msgid "Wide Gamut LCD RGB LED" -msgstr "" +msgstr "宽 Gamut LCD RGB LED" #. TRANSLATORS: this is the display technology, where #. * white means the color of the backlight, i.e. not #. * RGB LED msgid "LCD White LED" -msgstr "" +msgstr "LCD 白背光 LED" #. TRANSLATORS: this an unknown display technology msgid "Unknown" -msgstr "" +msgstr "未知" #. TRANSLATORS: the sensor state, e.g. 'idle' msgid "State" @@ -325,7 +340,7 @@ #. TRANSLATORS: sensor identifier msgid "Sensor ID" -msgstr "" +msgstr "传感器 ID" #. TRANSLATORS: the options for the sensor msgid "Options" @@ -342,7 +357,7 @@ #. TRANSLATORS: if the sensor supports calibrating different #. * display types, e.g. LCD, LED, Projector msgid "Capabilities" -msgstr "" +msgstr "支持的功能" msgid "There are no supported sensors attached" msgstr "未连结任何支持的传感器" @@ -353,30 +368,45 @@ #. TRANSLATORS: the user needs to change something on the device msgid "Set the device to the calibrate position and press enter." -msgstr "" +msgstr "将设备放置于校正位置然后按回车键" #. TRANSLATORS: the user needs to change something on the device msgid "Set the device to the surface position and press enter." +msgstr "将设备放置至表面位置然后按回车键。" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." msgstr "" msgid "Color" msgstr "色彩" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" -msgstr "" +msgstr "显示客户端及守护进程版本信息" #. TRANSLATORS: command line option msgid "Show the value without any header" -msgstr "" +msgstr "不带任何标头地显示数值" #. TRANSLATORS: command line option msgid "Filter object properties when displaying" -msgstr "" +msgstr "显示时过滤对象属性" #. TRANSLATORS: command description msgid "Dump all debug data to a file" -msgstr "" +msgstr "将所有调试文件转储到文件" #. TRANSLATORS: command description msgid "Gets all the color managed devices" @@ -395,6 +425,10 @@ msgstr "获取所有可用的色彩传感器" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "获得传感器读数" @@ -412,15 +446,15 @@ #. TRANSLATORS: command description msgid "Find a device from the device ID" -msgstr "" +msgstr "在设备 ID 中查找设备" #. TRANSLATORS: command description msgid "Find a device with a given property value" -msgstr "" +msgstr "根据属性值查找设备" #. TRANSLATORS: command description msgid "Find a profile from the profile ID" -msgstr "" +msgstr "在配置文件 ID 中查找配置文件" #. TRANSLATORS: command description msgid "Find a profile by filename" @@ -436,7 +470,7 @@ #. TRANSLATORS: command description msgid "Add a profile to a device that already exists" -msgstr "" +msgstr "向已存在的设备添加配置文件" #. TRANSLATORS: command description msgid "Makes a profile default for a device" @@ -452,7 +486,7 @@ #. TRANSLATORS: command description msgid "Sets extra properties on the profile" -msgstr "" +msgstr "为配置文件设置额外属性" #. TRANSLATORS: command description msgid "Sets the device model" @@ -460,7 +494,7 @@ #. TRANSLATORS: command description msgid "Enables or disables the device" -msgstr "" +msgstr "启用或禁用设备" #. TRANSLATORS: command description msgid "Gets the default profile for a device" @@ -480,7 +514,7 @@ #. TRANSLATORS: command description msgid "Inhibits color profiles for this device" -msgstr "" +msgstr "该设备禁用色彩配置文件" #. TRANSLATORS: command description msgid "Returns all the profiles that match a qualifier" @@ -488,62 +522,62 @@ #. TRANSLATORS: command description msgid "Import a profile and install it for the user" -msgstr "" +msgstr "导入配置文件并为用户安装" #. TRANSLATORS: no colord available msgid "No connection to colord:" msgstr "未连结到 colord：" msgid "Client version:" -msgstr "" +msgstr "客户端版本：" msgid "Daemon version:" -msgstr "" +msgstr "守护进程版本：" msgid "System vendor:" -msgstr "" +msgstr "计算机制造商：" msgid "System model:" -msgstr "" +msgstr "计算机型号：" msgid "Default gamma for the display" -msgstr "" +msgstr "用于显示的默认伽马值" msgid "" "The default target gamma value for the display. Common values are 1.8, 2.2 " "and 2.4." -msgstr "" +msgstr "用于显示对象的默认伽马值。常用值为 1.8，2.2 和 2.4。" msgid "Default display target whitepoint" -msgstr "" +msgstr "默认显示对象白点" msgid "" "The default target whitepoint in Kelvin for display calibration, with 0 " "meaning display native. Common values are 6500 for D65 and 5000 for D50." -msgstr "" +msgstr "显示器校准时的默认白色色温目标，按开氏度（热力学温标）计算，0 代表显示器原生色温。常用的数值是 6500K（D65）和 5000K（D50）。" msgid "Delay between sample intervals" -msgstr "" +msgstr "在采样间隔中设置延迟" msgid "" "This is the delay between setting the sample color and asking the measuring " "instrument to take a sample. It is required because both the graphics driver" " and the display itself introduce latency." -msgstr "" +msgstr "该延迟发生在设置样点颜色和要求测量设备采样的动作之间。由于图形驱动程序和显示器本身都会产生延迟，因此这是必须的。" msgid "Web service profile upload URI" -msgstr "" +msgstr "配置文件上传网络服务 URI" msgid "" "The URI of the web service that allows the calibration tools to upload a " "specific profile to the Internet." -msgstr "" +msgstr "网络服务 URI 可让校正工具向互联网上传特定的配置文件。" msgid "Compatible with Adobe RGB (1998)" -msgstr "" +msgstr "与 Adobe RGB (1998) 兼容" msgid "This profile is free of known copyright restrictions" -msgstr "" +msgstr "该配置文件免于已知的版权限制" #. TRANSLATORS: a editing space is a profile you use for editing, #. 'SWOP' is also a trademark so don't translate that @@ -562,7 +596,7 @@ "and Illustrator. As it is based on the original Apple 13\" RGB monitor and " "is similar to sRGB, it should not be used as a display profile or for new " "images." -msgstr "" +msgstr "该老式配置文件是 Adobe 公司最初创建用于 Photosohp 和 Illustrator 的。由于它基于原有的苹果 13\" RGB 显示器，并且与 sRGB 相近，因此它不应当用作显示器配置文件或用于现在较新的图像中。" #. TRANSLATORS: super-saturated is in reference to colors you can't show on a #. PC screen @@ -571,7 +605,7 @@ "suitable for images with highly saturated colors often used in " "advertisements. It is very similar to DonRGB4, but can show super-saturated " "red colors sometimes present in Fujichrome Velvia." -msgstr "" +msgstr "该色彩空间可显示比 Adobe RGB 更多的饱和色，适合常用于广告中的高饱和颜色图像。它与 DonRGB4 非常相近，但它能显示有时在富士 Fujichrome Velvia 反转片中出现的那种超饱和红色。" #. TRANSLATORS: 'shadow detail' is the number of black colors you can see msgid "" @@ -579,17 +613,17 @@ "less prone to quantisation errors compared to ProPhoto RGB, although more " "shadow detail is preserved. In most instances ProPhoto RGB is probably a " "better choice." -msgstr "" +msgstr "该色彩空间可显示比 Adobe RGB 更多的饱和色。尽管会保留更多的阴影区细节，但与 Prohoto RGB 相比，它不易产生量化误差。在大多数情况下，Prophoto RGB 还是更好的选择。" msgid "Blue" -msgstr "" +msgstr "蓝" #. TRANSLATORS: the lookup tables in the GPU map one color to another msgid "" "This test profile is used to make all colors on the screen slightly more " "blue by altering the video card lookup table. This allows the user to check " "the calibration is being applied correctly." -msgstr "" +msgstr "该测试配置文件通过变更视频卡查询表，可让显示器上显示的所有颜色都轻微发蓝。这可让用户检查校正是否已正确应用。" #. TRANSLATORS: 'Adobe Photoshop' is a trademark, don't translate msgid "" @@ -603,7 +637,7 @@ "This theoretical profile is designed for use in color experiments. You " "probably don't want to use this profile as a editing space or a display " "profile." -msgstr "" +msgstr "此纯理论配置文件用于色彩实验。您肯定不会用它作为编辑用色彩空间或显示器配置文件的。" #. TRANSLATORS: 'Radius' and 'PressView' are trademarks, please don't #. translate @@ -612,10 +646,10 @@ " profile as a display profile or as a editing space as the profile is not " "significantly different to sRGB. You should only need to use this profile if" " viewing images created on a PressView monitor." -msgstr "" +msgstr "该配置文件由 Radius 设计用于 PressView 显示器。该文件仅用于显示器配置文件；如果该配置文件与 sRGB 区别不大的话，也会用于编辑时的色彩空间。您只有在浏览用 PressView 显示器创建的图像时，才会用到该配置文件。" msgid "Crayon Colors" -msgstr "" +msgstr "蜡笔色彩" #. TRANSLATORS: 'Crayola' is a trademark, please don't translate, #. also 'named colors' are color swatches with a name, e.g. 'Royal Rose' @@ -623,14 +657,14 @@ "This named color profile contains all the Crayola crayon colors in popular " "use. It is a test profile designed for testing embedding named colors into " "documents." -msgstr "" +msgstr "该色彩配置文件包含了所有常用的 Crayola 蜡笔颜色。该文件用于测试将命名了的颜色嵌入文档。" #. TRANSLATORS: saturated means vivid bright colors msgid "" "This editing space can display more saturated colors than Adobe RGB and is " "suitable for images with highly saturated colors often used in " "advertisements." -msgstr "" +msgstr "该色彩空间可显示比 Adobe RGB 更多的饱和色，适合常用于广告中的高饱和色图像。" #. TRANSLATORS: ECI is a trademark, don't translate msgid "" @@ -737,7 +771,7 @@ msgstr "" msgid "GRACoL TR006 Coated" -msgstr "" +msgstr "GRACoL TR006 铜版纸" #. TRANSLATORS: coated = smooth and expensive msgid "" @@ -746,7 +780,7 @@ msgstr "" msgid "IFRA26S 2004 Newsprint" -msgstr "" +msgstr "IFRA26S 2004 新闻纸" #. TRANSLATORS: TVI stands for 'tone value increase' and is another name for #. dot gain, coldset means letting the ink dry without heating it @@ -792,10 +826,10 @@ msgid "" "This is the current standard used by North America and Japan for studio " "recording. You should only use this profile to encode or decode video." -msgstr "" +msgstr "这是目前北美和日本工作室视频录制时时用的标准。该配置文件仅用于视频的编解码。" msgid "SNAP TR002 Newsprint" -msgstr "" +msgstr "SNAP TR002 新闻纸" #. TRANSLATORS: CGATS is a trademark #, no-c-format @@ -812,20 +846,20 @@ "and used in HDTV. Most uncalibrated displays are able to display most of the" " colors available in sRGB, although this profile is sometimes a poor choice " "for printing." -msgstr "" +msgstr "该配置文件由惠普和微软设计，用于未标记的 RGB 颜色和高清电视中，它一直是互联网上的默认配置文件。尽管该配置文件用于打印往往是个糟糕的选择，但多数未校正的显示器都可以显示出 sRGB 中的大多数颜色。" msgid "Swapped Red and Green" -msgstr "" +msgstr "红绿色互换" #. TRANSLATORS: channels refer to the RGB values in an image msgid "" "This test profile swaps the red and green channels and is useful as a visual" " check that profiles are being applied correctly. If this profile is applied" " twice, the image looks unchanged." -msgstr "" +msgstr "该配置文件将红绿通道互换，在检查配置文件是否正确应用时非常有用。如果该配置文件应用了两次，那么图像外观不会发生变化。" msgid "SWOP TR003 Coated" -msgstr "" +msgstr "SWOP TR003 铜版纸" #. TRANSLATORS: FOGRA is a trademark msgid "" @@ -835,7 +869,7 @@ msgstr "" msgid "SWOP TR005 Coated" -msgstr "" +msgstr "SWOP TR005 铜版纸" #. TRANSLATORS: FOGRA is a trademark msgid "" @@ -845,7 +879,7 @@ msgstr "" msgid "Wide Gamut RGB" -msgstr "" +msgstr "宽 Gamut RGB" #. TRANSLATORS: 'Adobe Systems' is a trademark, don't translate that msgid "" @@ -857,14 +891,14 @@ msgstr "" msgid "X11 Colors" -msgstr "" +msgstr "X11 色彩空间" #. TRANSLATORS: A 'named color profile' contains a list of color swatches that #. look the same on all computer screens msgid "" "This named color profile contains all the colors defined by X11, assuming " "the source colors were supposed to be sRGB." -msgstr "" +msgstr "该色彩空间包含了 X11 定义的所有颜色，它假定来源颜色空间是 sRGB。" #. SECURITY: #. - Normal users should not have to authenticate to add devices @@ -965,7 +999,7 @@ #. TRANSLATORS: exit straight away, used for automatic profiling msgid "Create a dummy sensor for testing" -msgstr "" +msgstr "创建用于测试的假感应器" msgid "Color Management D-Bus Service" msgstr "色彩管理 D-Bus 服务" diff -Nru colord-1.2.12/po/zh_TW.po colord-1.3.2/po/zh_TW.po --- colord-1.2.12/po/zh_TW.po 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/po/zh_TW.po 2015-12-02 10:29:59.000000000 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: colord\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 20:30+0100\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" +"POT-Creation-Date: 2015-11-27 15:21+0000\n" +"PO-Revision-Date: 2015-11-27 15:21+0000\n" "Last-Translator: Richard Hughes \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/colord/language/zh_TW/)\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/hughsie/colord/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -267,6 +267,18 @@ msgid "Calibration" msgstr "校準" +#. TRANSLATORS: this is the display calibration type +msgid "Dark Calibration" +msgstr "" + +#. TRANSLATORS: this is the display calibration type +msgid "Irradiance Calibration" +msgstr "" + +#. TRANSLATORS: this is the sensor capability +msgid "Spectral" +msgstr "" + #. TRANSLATORS: this is the display technology, #. * where LCD stands for 'Liquid Crystal Display' msgid "LCD Generic" @@ -359,9 +371,24 @@ msgid "Set the device to the surface position and press enter." msgstr "將裝置設定至表面位置，再按下 Enter。" +#. TRANSLATORS: the user needs to change something on the device +msgid "Put the device in a dark place and press enter." +msgstr "" + +#. TRANSLATORS: the user needs to change something on the device +msgid "Calibrate with a 3200K light source." +msgstr "" + +msgid "Put the device on the color to be measured and press enter." +msgstr "" + msgid "Color" msgstr "色彩" +#. TRANSLATORS: sensor can't do this +msgid "No spectral capability" +msgstr "" + #. TRANSLATORS: command line option msgid "Show client and daemon versions" msgstr "顯示客戶端與幕後程式版本" @@ -395,6 +422,10 @@ msgstr "取得所有可用的色彩感測器" #. TRANSLATORS: command description +msgid "Gets a spectral reading from a sensor" +msgstr "" + +#. TRANSLATORS: command description msgid "Gets a reading from a sensor" msgstr "從感測器取得讀取內容" diff -Nru colord-1.2.12/policy/Makefile.in colord-1.3.2/policy/Makefile.in --- colord-1.2.12/policy/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/policy/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -273,6 +273,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -377,6 +378,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/rules/69-cd-sensors.rules.in colord-1.3.2/rules/69-cd-sensors.rules.in --- colord-1.2.12/rules/69-cd-sensors.rules.in 2015-06-08 13:17:25.000000000 +0000 +++ colord-1.3.2/rules/69-cd-sensors.rules.in 2015-11-16 08:45:08.000000000 +0000 @@ -86,7 +86,6 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1004", ENV{COLORD_SENSOR_KIND}="colorhug2", ENV{COLORD_SENSOR_CAPS}="lcd" # ColorHug Plus -ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1003", ENV{COLORD_SENSOR_KIND}="colorhug-plus", ENV{COLORD_IGNORE}="1" ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1002", ENV{COLORD_SENSOR_KIND}="colorhug-plus", ENV{COLORD_SENSOR_CAPS}="lcd" # ColorHug ALS diff -Nru colord-1.2.12/rules/Makefile.in colord-1.3.2/rules/Makefile.in --- colord-1.2.12/rules/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/rules/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -274,6 +274,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -378,6 +379,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/src/cd-common.c colord-1.3.2/src/cd-common.c --- colord-1.2.12/src/cd-common.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-common.c 2016-02-17 13:28:15.000000000 +0000 @@ -27,9 +27,16 @@ #include #endif -#include "cd-cleanup.h" #include "cd-common.h" +#ifdef USE_POLKIT +#ifndef PolkitAuthorizationResult_autoptr +G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAuthorizationResult, g_object_unref) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitSubject, g_object_unref) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAuthority, g_object_unref) +#endif +#endif + /** * cd_client_error_quark: **/ @@ -74,7 +81,7 @@ GError **error) { guint uid = G_MAXUINT; - _cleanup_variant_unref_ GVariant *value = NULL; + g_autoptr(GVariant) value = NULL; /* call into DBus to get the user ID that issued the request */ value = g_dbus_connection_call_sync (connection, @@ -103,7 +110,7 @@ GError **error) { guint pid = G_MAXUINT; - _cleanup_variant_unref_ GVariant *value = NULL; + g_autoptr(GVariant) value = NULL; /* call into DBus to get the user ID that issued the request */ value = g_dbus_connection_call_sync (connection, @@ -133,11 +140,11 @@ GError **error) { guint uid; - _cleanup_error_free_ GError *error_local = NULL; + g_autoptr(GError) error_local = NULL; #ifdef USE_POLKIT - _cleanup_object_unref_ PolkitAuthority *authority = NULL; - _cleanup_object_unref_ PolkitAuthorizationResult *result = NULL; - _cleanup_object_unref_ PolkitSubject *subject = NULL; + g_autoptr(PolkitAuthority) authority = NULL; + g_autoptr(PolkitAuthorizationResult) result = NULL; + g_autoptr(PolkitSubject) subject = NULL; #endif /* uid 0 is allowed to do all actions */ @@ -223,7 +230,7 @@ { /* ensure desination exists */ if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GFile) file = NULL; file = g_file_new_for_path (filename); return g_file_make_directory_with_parents (file, NULL, error); } diff -Nru colord-1.2.12/src/cd-device-array.c colord-1.3.2/src/cd-device-array.c --- colord-1.2.12/src/cd-device-array.c 2015-07-20 09:53:38.000000000 +0000 +++ colord-1.3.2/src/cd-device-array.c 2015-10-13 15:24:13.000000000 +0000 @@ -28,19 +28,19 @@ static void cd_device_array_finalize (GObject *object); -#define CD_DEVICE_ARRAY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_DEVICE_ARRAY, CdDeviceArrayPrivate)) +#define GET_PRIVATE(o) (cd_device_array_get_instance_private (o)) /** * CdDeviceArrayPrivate: * * Private #CdDeviceArray data **/ -struct _CdDeviceArrayPrivate +typedef struct { GPtrArray *array; -}; +} CdDeviceArrayPrivate; -G_DEFINE_TYPE (CdDeviceArray, cd_device_array, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdDeviceArray, cd_device_array, G_TYPE_OBJECT) static gpointer cd_device_array_object = NULL; @@ -50,10 +50,12 @@ void cd_device_array_add (CdDeviceArray *device_array, CdDevice *device) { + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); + g_return_if_fail (CD_IS_DEVICE_ARRAY (device_array)); g_return_if_fail (CD_IS_DEVICE (device)); - g_ptr_array_add (device_array->priv->array, + g_ptr_array_add (priv->array, g_object_ref (device)); } @@ -63,10 +65,12 @@ void cd_device_array_remove (CdDeviceArray *device_array, CdDevice *device) { + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); + g_return_if_fail (CD_IS_DEVICE_ARRAY (device_array)); g_return_if_fail (CD_IS_DEVICE (device)); - g_ptr_array_remove (device_array->priv->array, + g_ptr_array_remove (priv->array, device); } @@ -79,7 +83,7 @@ guint owner, CdDeviceArrayFlags flags) { - CdDeviceArrayPrivate *priv = device_array->priv; + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); CdDevice *device_tmp; guint i; @@ -108,7 +112,7 @@ cd_device_array_get_by_object_path (CdDeviceArray *device_array, const gchar *object_path) { - CdDeviceArrayPrivate *priv = device_array->priv; + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); CdDevice *device_tmp; guint i; @@ -129,7 +133,7 @@ const gchar *key, const gchar *value) { - CdDeviceArrayPrivate *priv = device_array->priv; + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); CdDevice *device_tmp; const gchar *value_tmp; guint i; @@ -150,7 +154,7 @@ GPtrArray * cd_device_array_get_array (CdDeviceArray *device_array) { - CdDeviceArrayPrivate *priv = device_array->priv; + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); return g_ptr_array_ref (priv->array); } @@ -161,7 +165,7 @@ cd_device_array_get_by_kind (CdDeviceArray *device_array, CdDeviceKind kind) { - CdDeviceArrayPrivate *priv = device_array->priv; + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); CdDevice *device_tmp; GPtrArray *array_tmp = NULL; guint i; @@ -187,8 +191,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = cd_device_array_finalize; - - g_type_class_add_private (klass, sizeof (CdDeviceArrayPrivate)); } /** @@ -197,8 +199,8 @@ static void cd_device_array_init (CdDeviceArray *device_array) { - device_array->priv = CD_DEVICE_ARRAY_GET_PRIVATE (device_array); - device_array->priv->array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); + priv->array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); } /** @@ -208,7 +210,7 @@ cd_device_array_finalize (GObject *object) { CdDeviceArray *device_array = CD_DEVICE_ARRAY (object); - CdDeviceArrayPrivate *priv = device_array->priv; + CdDeviceArrayPrivate *priv = GET_PRIVATE (device_array); g_ptr_array_unref (priv->array); diff -Nru colord-1.2.12/src/cd-device-array.h colord-1.3.2/src/cd-device-array.h --- colord-1.2.12/src/cd-device-array.h 2015-07-20 09:56:16.000000000 +0000 +++ colord-1.3.2/src/cd-device-array.h 2015-10-13 15:24:13.000000000 +0000 @@ -28,22 +28,8 @@ G_BEGIN_DECLS -#define CD_TYPE_DEVICE_ARRAY (cd_device_array_get_type ()) -#define CD_DEVICE_ARRAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_DEVICE_ARRAY, CdDeviceArray)) -#define CD_DEVICE_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_DEVICE_ARRAY, CdDeviceArrayClass)) -#define CD_IS_DEVICE_ARRAY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_DEVICE_ARRAY)) -#define CD_IS_DEVICE_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_DEVICE_ARRAY)) -#define CD_DEVICE_ARRAY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_DEVICE_ARRAY, CdDeviceArrayClass)) - -typedef struct _CdDeviceArrayPrivate CdDeviceArrayPrivate; -typedef struct _CdDeviceArray CdDeviceArray; -typedef struct _CdDeviceArrayClass CdDeviceArrayClass; - -struct _CdDeviceArray -{ - GObject parent; - CdDeviceArrayPrivate *priv; -}; +#define CD_TYPE_DEVICE_ARRAY (cd_device_array_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdDeviceArray, cd_device_array, CD, DEVICE_ARRAY, GObject) struct _CdDeviceArrayClass { @@ -56,7 +42,6 @@ CD_DEVICE_ARRAY_FLAG_LAST, } CdDeviceArrayFlags; -GType cd_device_array_get_type (void); CdDeviceArray *cd_device_array_new (void); void cd_device_array_add (CdDeviceArray *device_array, diff -Nru colord-1.2.12/src/cd-device.c colord-1.3.2/src/cd-device.c --- colord-1.2.12/src/cd-device.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-device.c 2015-10-13 15:24:13.000000000 +0000 @@ -29,7 +29,6 @@ #include #endif -#include "cd-cleanup.h" #include "cd-common.h" #include "cd-device.h" #include "cd-mapping-db.h" @@ -44,14 +43,14 @@ GVariant *property_value); static void cd_device_dbus_emit_device_changed (CdDevice *device); -#define CD_DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_DEVICE, CdDevicePrivate)) +#define GET_PRIVATE(o) (cd_device_get_instance_private (o)) /** * CdDevicePrivate: * * Private #CdDevice data **/ -struct _CdDevicePrivate +typedef struct { CdObjectScope object_scope; CdProfileArray *profile_array; @@ -80,7 +79,7 @@ GHashTable *metadata; guint owner; gchar *seat; -}; +} CdDevicePrivate; enum { SIGNAL_INVALIDATE, @@ -101,7 +100,7 @@ } CdDeviceProfileItem; static guint signals[SIGNAL_LAST] = { 0 }; -G_DEFINE_TYPE (CdDevice, cd_device, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdDevice, cd_device, G_TYPE_OBJECT) /** * cd_device_error_quark: @@ -128,8 +127,9 @@ CdObjectScope cd_device_get_scope (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), 0); - return device->priv->object_scope; + return priv->object_scope; } /** @@ -138,8 +138,9 @@ void cd_device_set_scope (CdDevice *device, CdObjectScope object_scope) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_if_fail (CD_IS_DEVICE (device)); - device->priv->object_scope = object_scope; + priv->object_scope = object_scope; } /** @@ -148,8 +149,9 @@ guint cd_device_get_owner (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), G_MAXUINT); - return device->priv->owner; + return priv->owner; } /** @@ -158,8 +160,9 @@ void cd_device_set_owner (CdDevice *device, guint owner) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_if_fail (CD_IS_DEVICE (device)); - device->priv->owner = owner; + priv->owner = owner; } /** @@ -168,8 +171,9 @@ const gchar * cd_device_get_seat (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - return device->priv->seat; + return priv->seat; } /** @@ -178,8 +182,9 @@ void cd_device_set_seat (CdDevice *device, const gchar *seat) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_if_fail (CD_IS_DEVICE (device)); - device->priv->seat = g_strdup (seat); + priv->seat = g_strdup (seat); } /** @@ -214,9 +219,10 @@ void cd_device_set_mode (CdDevice *device, CdDeviceMode mode) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_if_fail (CD_IS_DEVICE (device)); - g_free (device->priv->mode); - device->priv->mode = g_strdup (_cd_device_mode_to_string (mode)); + g_free (priv->mode); + priv->mode = g_strdup (_cd_device_mode_to_string (mode)); } /** @@ -225,8 +231,9 @@ CdDeviceMode cd_device_get_mode (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), CD_DEVICE_MODE_UNKNOWN); - return _cd_device_mode_from_string (device->priv->mode); + return _cd_device_mode_from_string (priv->mode); } /** @@ -235,8 +242,9 @@ const gchar * cd_device_get_object_path (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - return device->priv->object_path; + return priv->object_path; } /** @@ -245,8 +253,9 @@ const gchar * cd_device_get_id (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - return device->priv->id; + return priv->id; } /** @@ -255,8 +264,9 @@ const gchar * cd_device_get_model (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), NULL); - return device->priv->model; + return priv->model; } /** @@ -265,8 +275,9 @@ CdDeviceKind cd_device_get_kind (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_val_if_fail (CD_IS_DEVICE (device), CD_DEVICE_KIND_UNKNOWN); - return device->priv->kind; + return priv->kind; } /** @@ -275,9 +286,10 @@ void cd_device_set_kind (CdDevice *device, CdDeviceKind kind) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (kind != CD_DEVICE_KIND_UNKNOWN); - device->priv->kind = kind; + priv->kind = kind; } /** @@ -286,37 +298,38 @@ static void cd_device_set_object_path (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); #ifdef HAVE_PWD_H struct passwd *pw; #endif - _cleanup_free_ gchar *path_owner = NULL; - _cleanup_free_ gchar *path_tmp = NULL; + g_autofree gchar *path_owner = NULL; + g_autofree gchar *path_tmp = NULL; /* append the uid to the object path */ #ifdef HAVE_PWD_H - pw = getpwuid (device->priv->owner); - if (device->priv->owner == 0 || + pw = getpwuid (priv->owner); + if (priv->owner == 0 || g_strcmp0 (pw->pw_name, DAEMON_USER) == 0) { - path_tmp = g_strdup (device->priv->id); + path_tmp = g_strdup (priv->id); } else { path_tmp = g_strdup_printf ("%s_%s_%d", - device->priv->id, + priv->id, pw->pw_name, - device->priv->owner); + priv->owner); } #else - if (device->priv->owner == 0) { - path_tmp = g_strdup (device->priv->id); + if (priv->owner == 0) { + path_tmp = g_strdup (priv->id); } else { path_tmp = g_strdup_printf ("%s_%d", - device->priv->id, - device->priv->owner); + priv->id, + priv->owner); } #endif /* make sure object path is sane */ path_owner = cd_main_ensure_dbus_path (path_tmp); - device->priv->object_path = g_build_filename (COLORD_DBUS_PATH, + priv->object_path = g_build_filename (COLORD_DBUS_PATH, "devices", path_owner, NULL); @@ -328,26 +341,27 @@ void cd_device_set_id (CdDevice *device, const gchar *id) { - _cleanup_free_ gchar *enabled_str = NULL; + CdDevicePrivate *priv = GET_PRIVATE (device); + g_autofree gchar *enabled_str = NULL; g_return_if_fail (CD_IS_DEVICE (device)); - g_free (device->priv->id); - device->priv->id = g_strdup (id); + g_free (priv->id); + priv->id = g_strdup (id); /* now calculate this again */ cd_device_set_object_path (device); /* find initial enabled state */ - enabled_str = cd_device_db_get_property (device->priv->device_db, - device->priv->id, + enabled_str = cd_device_db_get_property (priv->device_db, + priv->id, "Enabled", NULL); if (g_strcmp0 (enabled_str, "False") == 0) { g_debug ("%s disabled by db at load", id); - device->priv->enabled = FALSE; + priv->enabled = FALSE; } else { - device->priv->enabled = TRUE; + priv->enabled = TRUE; } } @@ -357,9 +371,10 @@ static void cd_device_reset_modified (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_debug ("CdDevice: set device Modified"); - device->priv->modified = g_get_real_time (); - device->priv->require_modified_signal = TRUE; + priv->modified = g_get_real_time (); + priv->require_modified_signal = TRUE; } /** @@ -370,11 +385,12 @@ const gchar *property_name, GVariant *property_value) { + CdDevicePrivate *priv = GET_PRIVATE (device); GVariantBuilder builder; GVariantBuilder invalidated_builder; /* not yet connected */ - if (device->priv->connection == NULL) + if (priv->connection == NULL) return; /* build the dict */ @@ -384,16 +400,16 @@ "{sv}", property_name, property_value); - if (device->priv->require_modified_signal) { + if (priv->require_modified_signal) { g_variant_builder_add (&builder, "{sv}", CD_DEVICE_PROPERTY_MODIFIED, - g_variant_new_uint64 (device->priv->modified)); - device->priv->require_modified_signal = FALSE; + g_variant_new_uint64 (priv->modified)); + priv->require_modified_signal = FALSE; } - g_dbus_connection_emit_signal (device->priv->connection, + g_dbus_connection_emit_signal (priv->connection, NULL, - device->priv->object_path, + priv->object_path, "org.freedesktop.DBus.Properties", "PropertiesChanged", g_variant_new ("(sa{sv}as)", @@ -411,14 +427,16 @@ static void cd_device_dbus_emit_device_changed (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); + /* not yet connected */ - if (device->priv->connection == NULL) + if (priv->connection == NULL) return; /* emit signal */ g_debug ("CdDevice: emit Changed on %s", cd_device_get_object_path (device)); - g_dbus_connection_emit_signal (device->priv->connection, + g_dbus_connection_emit_signal (priv->connection, NULL, cd_device_get_object_path (device), COLORD_DBUS_INTERFACE_DEVICE, @@ -428,7 +446,7 @@ /* emit signal */ g_debug ("CdDevice: emit Changed"); - g_dbus_connection_emit_signal (device->priv->connection, + g_dbus_connection_emit_signal (priv->connection, NULL, COLORD_DBUS_PATH, COLORD_DBUS_INTERFACE, @@ -445,8 +463,8 @@ cd_device_match_qualifier (const gchar *qual1, const gchar *qual2) { guint i; - _cleanup_strv_free_ gchar **split1 = NULL; - _cleanup_strv_free_ gchar **split2 = NULL; + g_auto(GStrv) split1 = NULL; + g_auto(GStrv) split2 = NULL; /* split into substring */ split1 = g_strsplit (qual1, ".", 3); @@ -547,11 +565,12 @@ static GVariant * cd_device_get_profiles_as_variant (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); CdDeviceProfileItem *item; const gchar *tmp; guint i; guint idx = 0; - _cleanup_free_ GVariant **profiles = NULL; + g_autofree GVariant **profiles = NULL; /* Object paths are assembled in this order: * @@ -559,16 +578,16 @@ * 2. Soft mapped profiles of DATA_source != EDID * 2. Soft mapped profiles of DATA_source == EDID */ - profiles = g_new0 (GVariant *, device->priv->profiles->len + 1); - for (i = 0; i < device->priv->profiles->len; i++) { - item = g_ptr_array_index (device->priv->profiles, i); + profiles = g_new0 (GVariant *, priv->profiles->len + 1); + for (i = 0; i < priv->profiles->len; i++) { + item = g_ptr_array_index (priv->profiles, i); if (item->relation != CD_DEVICE_RELATION_HARD) continue; tmp = cd_profile_get_object_path (item->profile); profiles[idx++] = g_variant_new_object_path (tmp); } - for (i = 0; i < device->priv->profiles->len; i++) { - item = g_ptr_array_index (device->priv->profiles, i); + for (i = 0; i < priv->profiles->len; i++) { + item = g_ptr_array_index (priv->profiles, i); if (item->relation != CD_DEVICE_RELATION_SOFT) continue; tmp = cd_profile_get_metadata_item (item->profile, @@ -578,8 +597,8 @@ tmp = cd_profile_get_object_path (item->profile); profiles[idx++] = g_variant_new_object_path (tmp); } - for (i = 0; i < device->priv->profiles->len; i++) { - item = g_ptr_array_index (device->priv->profiles, i); + for (i = 0; i < priv->profiles->len; i++) { + item = g_ptr_array_index (priv->profiles, i); if (item->relation != CD_DEVICE_RELATION_SOFT) continue; tmp = cd_profile_get_metadata_item (item->profile, @@ -593,7 +612,7 @@ /* format the value */ return g_variant_new_array (G_VARIANT_TYPE_OBJECT_PATH, profiles, - device->priv->profiles->len); + priv->profiles->len); } /** @@ -604,7 +623,7 @@ const gchar *profile_object_path, GError **error) { - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); CdDeviceProfileItem *item; gboolean ret = FALSE; guint i; @@ -652,7 +671,7 @@ cd_device_find_profile_relation (CdDevice *device, const gchar *profile_object_path) { - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); CdDeviceProfileItem *item; guint i; @@ -708,11 +727,11 @@ guint64 timestamp, GError **error) { - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); CdDeviceProfileItem *item; gboolean create_item = TRUE; guint i; - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(CdProfile) profile = NULL; /* is it available */ profile = cd_profile_array_get_by_object_path (priv->profile_array, @@ -757,7 +776,7 @@ g_debug ("Adding %s [%s] to %s", cd_profile_get_id (profile), _cd_device_relation_to_string (relation), - device->priv->id); + priv->id); item = g_new0 (CdDeviceProfileItem, 1); item->profile = g_object_ref (profile); item->relation = relation; @@ -788,14 +807,15 @@ const gchar *property, const gchar *value) { + CdDevicePrivate *priv = GET_PRIVATE (device); gboolean ret; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; - if (device->priv->object_scope != CD_OBJECT_SCOPE_DISK) + if (priv->object_scope != CD_OBJECT_SCOPE_DISK) return; - ret = cd_device_db_set_property (device->priv->device_db, - device->priv->id, + ret = cd_device_db_set_property (priv->device_db, + priv->id, property, value, &error); @@ -811,22 +831,23 @@ static GVariant * cd_device_get_metadata_as_variant (CdDevice *device) { + CdDevicePrivate *priv = GET_PRIVATE (device); GList *l; GVariantBuilder builder; - _cleanup_list_free_ GList *list = NULL; + g_autoptr(GList) list = NULL; /* do not try to build an empty array */ - if (g_hash_table_size (device->priv->metadata) == 0) + if (g_hash_table_size (priv->metadata) == 0) return g_variant_new_array (G_VARIANT_TYPE ("{ss}"), NULL, 0); /* add all the keys in the dictionary to the variant builder */ - list = g_hash_table_get_keys (device->priv->metadata); + list = g_hash_table_get_keys (priv->metadata); g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); for (l = list; l != NULL; l = l->next) { g_variant_builder_add (&builder, "{ss}", l->data, - g_hash_table_lookup (device->priv->metadata, + g_hash_table_lookup (priv->metadata, l->data)); } return g_variant_builder_end (&builder); @@ -854,8 +875,9 @@ static void cd_device_set_vendor (CdDevice *device, const gchar *vendor) { - g_free (device->priv->vendor); - device->priv->vendor = cd_quirk_vendor_name (vendor); + CdDevicePrivate *priv = GET_PRIVATE (device); + g_free (priv->vendor); + priv->vendor = cd_quirk_vendor_name (vendor); } /** @@ -864,8 +886,8 @@ static void cd_device_set_model (CdDevice *device, const gchar *model) { + CdDevicePrivate *priv = GET_PRIVATE (device); GString *tmp; - CdDevicePrivate *priv = device->priv; /* remove insanities */ tmp = g_string_new (model); @@ -900,7 +922,7 @@ static void cd_device_set_serial (CdDevice *device, const gchar *value) { - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); gchar *tmp; /* CUPS likes to hand us a serial with a URI prepended */ @@ -924,7 +946,7 @@ GError **error) { gboolean is_metadata = FALSE; - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); /* sanity check the length of the key and value */ if (strlen (property) > CD_DBUS_METADATA_KEY_LEN_MAX) { @@ -943,7 +965,7 @@ } g_debug ("CdDevice: Attempting to set %s to %s on %s", - property, value, device->priv->id); + property, value, priv->id); if (g_strcmp0 (property, CD_DEVICE_PROPERTY_MODEL) == 0) { cd_device_set_model (device, value); } else if (g_strcmp0 (property, CD_DEVICE_PROPERTY_KIND) == 0) { @@ -969,7 +991,7 @@ } else { /* add to metadata */ is_metadata = TRUE; - g_hash_table_insert (device->priv->metadata, + g_hash_table_insert (priv->metadata, g_strdup (property), g_strdup (value)); cd_device_dbus_emit_property_changed (device, @@ -1000,13 +1022,14 @@ const gchar * cd_device_get_metadata (CdDevice *device, const gchar *key) { + CdDevicePrivate *priv = GET_PRIVATE (device); if (g_strcmp0 (key, CD_DEVICE_PROPERTY_MODEL) == 0) - return device->priv->model; + return priv->model; if (g_strcmp0 (key, CD_DEVICE_PROPERTY_VENDOR) == 0) - return device->priv->vendor; + return priv->vendor; if (g_strcmp0 (key, CD_DEVICE_PROPERTY_SERIAL) == 0) - return device->priv->serial; - return g_hash_table_lookup (device->priv->metadata, key); + return priv->serial; + return g_hash_table_lookup (priv->metadata, key); } /** @@ -1017,7 +1040,7 @@ const gchar *profile_object_path, GError **error) { - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); CdDeviceProfileItem *item; CdProfile *profile; guint i; @@ -1067,17 +1090,17 @@ gboolean enabled, GError **error) { - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); gboolean ret; - _cleanup_error_free_ GError *error_local = NULL; + g_autoptr(GError) error_local = NULL; /* device is already the correct state */ if (priv->enabled == enabled) return TRUE; /* update database */ - ret = cd_device_db_set_property (device->priv->device_db, - device->priv->id, + ret = cd_device_db_set_property (priv->device_db, + priv->id, "Enabled", enabled ? "True" : "False", &error_local); @@ -1115,7 +1138,7 @@ GDBusMethodInvocation *invocation, gpointer user_data) { CdDevice *device = CD_DEVICE (user_data); - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); CdDeviceRelation relation = CD_DEVICE_RELATION_UNKNOWN; CdProfile *profile = NULL; GVariant *tuple = NULL; @@ -1126,7 +1149,7 @@ const gchar *property_value = NULL; gboolean ret; guint i = 0; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* return '' */ if (g_strcmp0 (method_name, "AddProfile") == 0) { @@ -1277,7 +1300,7 @@ /* return 'o' */ if (g_strcmp0 (method_name, "GetProfileForQualifiers") == 0) { gchar **regexes = NULL; - _cleanup_free_ gchar *strv_debug = NULL; + g_autofree gchar *strv_debug = NULL; /* find the profile by the qualifier search string */ g_variant_get (parameters, "(^a&s)", ®exes); @@ -1536,8 +1559,8 @@ gpointer user_data) { CdDevice *device = CD_DEVICE (user_data); - CdDevicePrivate *priv = device->priv; - _cleanup_strv_free_ gchar **bus_names = NULL; + CdDevicePrivate *priv = GET_PRIVATE (device); + g_auto(GStrv) bus_names = NULL; if (g_strcmp0 (property_name, CD_DEVICE_PROPERTY_CREATED) == 0) return g_variant_new_uint64 (priv->created); @@ -1596,7 +1619,8 @@ GDBusInterfaceInfo *info, GError **error) { - _cleanup_error_free_ GError *error_local = NULL; + CdDevicePrivate *priv = GET_PRIVATE (device); + g_autoptr(GError) error_local = NULL; static const GDBusInterfaceVTable interface_vtable = { cd_device_dbus_method_call, @@ -1604,16 +1628,16 @@ NULL }; - device->priv->connection = connection; - device->priv->registration_id = g_dbus_connection_register_object ( + priv->connection = connection; + priv->registration_id = g_dbus_connection_register_object ( connection, - device->priv->object_path, + priv->object_path, info, &interface_vtable, device, /* user_data */ NULL, /* user_data_free_func */ &error_local); /* GError** */ - if (device->priv->registration_id == 0) { + if (priv->registration_id == 0) { g_set_error (error, CD_DEVICE_ERROR, CD_DEVICE_ERROR_INTERNAL, @@ -1622,8 +1646,8 @@ return FALSE; } g_debug ("CdDevice: Register interface %i on %s", - device->priv->registration_id, - device->priv->object_path); + priv->registration_id, + priv->object_path); return TRUE; } @@ -1646,9 +1670,10 @@ void cd_device_watch_sender (CdDevice *device, const gchar *sender) { + CdDevicePrivate *priv = GET_PRIVATE (device); g_return_if_fail (CD_IS_DEVICE (device)); g_return_if_fail (sender != NULL); - device->priv->watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, + priv->watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, sender, G_BUS_NAME_WATCHER_FLAGS_NONE, NULL, @@ -1664,7 +1689,7 @@ cd_device_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { CdDevice *device = CD_DEVICE (object); - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); switch (prop_id) { case PROP_OBJECT_PATH: @@ -1686,7 +1711,7 @@ cd_device_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { CdDevice *device = CD_DEVICE (object); - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); switch (prop_id) { case PROP_OBJECT_PATH: @@ -1740,8 +1765,6 @@ G_STRUCT_OFFSET (CdDeviceClass, invalidate), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - g_type_class_add_private (klass, sizeof (CdDevicePrivate)); } /** @@ -1760,19 +1783,19 @@ static void cd_device_init (CdDevice *device) { - device->priv = CD_DEVICE_GET_PRIVATE (device); - device->priv->profiles = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_device_profiles_item_free); - device->priv->profile_array = cd_profile_array_new (); - device->priv->created = g_get_real_time (); - device->priv->modified = g_get_real_time (); - device->priv->mapping_db = cd_mapping_db_new (); - device->priv->device_db = cd_device_db_new (); - device->priv->inhibit = cd_inhibit_new (); - g_signal_connect (device->priv->inhibit, + CdDevicePrivate *priv = GET_PRIVATE (device); + priv->profiles = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_device_profiles_item_free); + priv->profile_array = cd_profile_array_new (); + priv->created = g_get_real_time (); + priv->modified = g_get_real_time (); + priv->mapping_db = cd_mapping_db_new (); + priv->device_db = cd_device_db_new (); + priv->inhibit = cd_inhibit_new (); + g_signal_connect (priv->inhibit, "changed", G_CALLBACK (cd_device_inhibit_changed_cb), device); - device->priv->metadata = g_hash_table_new_full (g_str_hash, + priv->metadata = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); @@ -1785,7 +1808,7 @@ cd_device_finalize (GObject *object) { CdDevice *device = CD_DEVICE (object); - CdDevicePrivate *priv = device->priv; + CdDevicePrivate *priv = GET_PRIVATE (device); if (priv->watcher_id > 0) g_bus_unwatch_name (priv->watcher_id); diff -Nru colord-1.2.12/src/cd-device-db.c colord-1.3.2/src/cd-device-db.c --- colord-1.2.12/src/cd-device-db.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-device-db.c 2015-10-13 15:24:13.000000000 +0000 @@ -25,22 +25,21 @@ #include #include -#include "cd-cleanup.h" #include "cd-common.h" #include "cd-device-db.h" static void cd_device_db_finalize (GObject *object); -#define CD_DEVICE_DB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_DEVICE_DB, CdDeviceDbPrivate)) +#define GET_PRIVATE(o) (cd_device_db_get_instance_private (o)) -struct CdDeviceDbPrivate +typedef struct { sqlite3 *db; -}; +} CdDeviceDbPrivate; static gpointer cd_device_db_object = NULL; -G_DEFINE_TYPE (CdDeviceDb, cd_device_db, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdDeviceDb, cd_device_db, G_TYPE_OBJECT) /** * cd_device_db_load: @@ -50,13 +49,14 @@ const gchar *filename, GError **error) { + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); const gchar *statement; gchar *error_msg = NULL; gint rc; - _cleanup_free_ gchar *path = NULL; + g_autofree gchar *path = NULL; g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), FALSE); - g_return_val_if_fail (ddb->priv->db == NULL, FALSE); + g_return_val_if_fail (priv->db == NULL, FALSE); /* ensure the path exists */ path = g_path_get_dirname (filename); @@ -65,23 +65,23 @@ g_debug ("CdDeviceDb: trying to open database '%s'", filename); g_info ("Using device database file %s", filename); - rc = sqlite3_open (filename, &ddb->priv->db); + rc = sqlite3_open (filename, &priv->db); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, CD_CLIENT_ERROR_INTERNAL, "Can't open database: %s\n", - sqlite3_errmsg (ddb->priv->db)); - sqlite3_close (ddb->priv->db); + sqlite3_errmsg (priv->db)); + sqlite3_close (priv->db); return FALSE; } /* we don't need to keep doing fsync */ - sqlite3_exec (ddb->priv->db, "PRAGMA synchronous=OFF", + sqlite3_exec (priv->db, "PRAGMA synchronous=OFF", NULL, NULL, NULL); /* check devices */ - rc = sqlite3_exec (ddb->priv->db, "SELECT * FROM devices LIMIT 1", + rc = sqlite3_exec (priv->db, "SELECT * FROM devices LIMIT 1", NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_debug ("CdDeviceDb: creating table to repair: %s", error_msg); @@ -89,11 +89,11 @@ statement = "CREATE TABLE devices (" "device_id TEXT PRIMARY KEY," "device TEXT);"; - sqlite3_exec (ddb->priv->db, statement, NULL, NULL, NULL); + sqlite3_exec (priv->db, statement, NULL, NULL, NULL); } /* check properties version 2 */ - rc = sqlite3_exec (ddb->priv->db, "SELECT * FROM properties_v2 LIMIT 1", + rc = sqlite3_exec (priv->db, "SELECT * FROM properties_v2 LIMIT 1", NULL, NULL, &error_msg); if (rc != SQLITE_OK) { statement = "CREATE TABLE properties_v2 (" @@ -101,7 +101,7 @@ "property TEXT," "value TEXT," "PRIMARY KEY (device_id, property));"; - sqlite3_exec (ddb->priv->db, statement, NULL, NULL, NULL); + sqlite3_exec (priv->db, statement, NULL, NULL, NULL); } return TRUE; } @@ -113,15 +113,16 @@ cd_device_db_empty (CdDeviceDb *ddb, GError **error) { + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); const gchar *statement; gchar *error_msg = NULL; gint rc; g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), FALSE); - g_return_val_if_fail (ddb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); statement = "DELETE FROM devices;DELETE FROM properties_v2;"; - rc = sqlite3_exec (ddb->priv->db, statement, + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, @@ -143,13 +144,14 @@ const gchar *device_id, GError **error) { + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement; gint rc; g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), FALSE); - g_return_val_if_fail (ddb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); g_debug ("CdDeviceDb: add device %s", device_id); statement = sqlite3_mprintf ("INSERT INTO devices (device_id) " @@ -157,7 +159,7 @@ device_id); /* insert the entry */ - rc = sqlite3_exec (ddb->priv->db, statement, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -183,13 +185,14 @@ const gchar *value, GError **error) { + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement; gint rc; g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), FALSE); - g_return_val_if_fail (ddb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); g_debug ("CdDeviceDb: add device property %s [%s=%s]", device_id, property, value); @@ -198,7 +201,7 @@ device_id, property, value); /* insert the entry */ - rc = sqlite3_exec (ddb->priv->db, statement, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -222,6 +225,7 @@ const gchar *device_id, GError **error) { + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement1 = NULL; @@ -229,14 +233,14 @@ gint rc; g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), FALSE); - g_return_val_if_fail (ddb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); /* remove the entry */ g_debug ("CdDeviceDb: remove device %s", device_id); statement1 = sqlite3_mprintf ("DELETE FROM devices WHERE " "device_id = '%q';", device_id); - rc = sqlite3_exec (ddb->priv->db, statement1, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement1, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -250,7 +254,7 @@ statement2 = sqlite3_mprintf ("DELETE FROM properties_v2 WHERE " "device_id = '%q';", device_id); - rc = sqlite3_exec (ddb->priv->db, statement2, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement2, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -293,14 +297,15 @@ const gchar *property, GError **error) { + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); gchar *error_msg = NULL; gchar *statement; gint rc; gchar *value = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array_tmp = NULL; + g_autoptr(GPtrArray) array_tmp = NULL; g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), NULL); - g_return_val_if_fail (ddb->priv->db != NULL, NULL); + g_return_val_if_fail (priv->db != NULL, NULL); g_debug ("CdDeviceDb: get property %s for %s", property, device_id); statement = sqlite3_mprintf ("SELECT value FROM properties_v2 WHERE " @@ -310,7 +315,7 @@ /* remove the entry */ array_tmp = g_ptr_array_new_with_free_func (g_free); - rc = sqlite3_exec (ddb->priv->db, + rc = sqlite3_exec (priv->db, statement, cd_device_db_sqlite_cb, array_tmp, @@ -349,20 +354,21 @@ cd_device_db_get_devices (CdDeviceDb *ddb, GError **error) { + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); gchar *error_msg = NULL; gchar *statement; gint rc; GPtrArray *array = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array_tmp = NULL; + g_autoptr(GPtrArray) array_tmp = NULL; g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), NULL); - g_return_val_if_fail (ddb->priv->db != NULL, NULL); + g_return_val_if_fail (priv->db != NULL, NULL); /* get all the devices */ g_debug ("CdDeviceDb: get devices"); statement = sqlite3_mprintf ("SELECT device_id FROM devices;"); array_tmp = g_ptr_array_new_with_free_func (g_free); - rc = sqlite3_exec (ddb->priv->db, + rc = sqlite3_exec (priv->db, statement, cd_device_db_sqlite_cb, array_tmp, @@ -392,14 +398,15 @@ const gchar *device_id, GError **error) { + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); gchar *error_msg = NULL; gchar *statement; gint rc; GPtrArray *array = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array_tmp = NULL; + g_autoptr(GPtrArray) array_tmp = NULL; g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), NULL); - g_return_val_if_fail (ddb->priv->db != NULL, NULL); + g_return_val_if_fail (priv->db != NULL, NULL); /* get all the devices */ g_debug ("CdDeviceDb: get properties for device %s", device_id); @@ -407,7 +414,7 @@ "WHERE device_id = '%q';", device_id); array_tmp = g_ptr_array_new_with_free_func (g_free); - rc = sqlite3_exec (ddb->priv->db, + rc = sqlite3_exec (priv->db, statement, cd_device_db_sqlite_cb, array_tmp, @@ -438,7 +445,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = cd_device_db_finalize; - g_type_class_add_private (klass, sizeof (CdDeviceDbPrivate)); } /** @@ -447,7 +453,6 @@ static void cd_device_db_init (CdDeviceDb *ddb) { - ddb->priv = CD_DEVICE_DB_GET_PRIVATE (ddb); } /** @@ -457,13 +462,11 @@ static void cd_device_db_finalize (GObject *object) { - CdDeviceDb *ddb; - g_return_if_fail (CD_IS_DEVICE_DB (object)); - ddb = CD_DEVICE_DB (object); - g_return_if_fail (ddb->priv != NULL); + CdDeviceDb *ddb = CD_DEVICE_DB (object); + CdDeviceDbPrivate *priv = GET_PRIVATE (ddb); /* close the database */ - sqlite3_close (ddb->priv->db); + sqlite3_close (priv->db); G_OBJECT_CLASS (cd_device_db_parent_class)->finalize (object); } diff -Nru colord-1.2.12/src/cd-device-db.h colord-1.3.2/src/cd-device-db.h --- colord-1.2.12/src/cd-device-db.h 2015-04-22 09:56:47.000000000 +0000 +++ colord-1.3.2/src/cd-device-db.h 2015-10-13 15:24:13.000000000 +0000 @@ -26,27 +26,14 @@ G_BEGIN_DECLS -#define CD_TYPE_DEVICE_DB (cd_device_db_get_type ()) -#define CD_DEVICE_DB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_DEVICE_DB, CdDeviceDb)) -#define CD_DEVICE_DB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_DEVICE_DB, CdDeviceDbClass)) -#define CD_IS_DEVICE_DB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_DEVICE_DB)) -#define CD_IS_DEVICE_DB_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_DEVICE_DB)) -#define CD_DEVICE_DB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_DEVICE_DB, CdDeviceDbClass)) +#define CD_TYPE_DEVICE_DB (cd_device_db_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdDeviceDb, cd_device_db, CD, DEVICE_DB, GObject) -typedef struct CdDeviceDbPrivate CdDeviceDbPrivate; - -typedef struct -{ - GObject parent; - CdDeviceDbPrivate *priv; -} CdDeviceDb; - -typedef struct +struct _CdDeviceDbClass { GObjectClass parent_class; -} CdDeviceDbClass; +}; -GType cd_device_db_get_type (void); CdDeviceDb *cd_device_db_new (void); gboolean cd_device_db_load (CdDeviceDb *ddb, diff -Nru colord-1.2.12/src/cd-device.h colord-1.3.2/src/cd-device.h --- colord-1.2.12/src/cd-device.h 2015-04-22 09:56:47.000000000 +0000 +++ colord-1.3.2/src/cd-device.h 2015-10-13 15:24:13.000000000 +0000 @@ -29,23 +29,10 @@ G_BEGIN_DECLS -#define CD_TYPE_DEVICE (cd_device_get_type ()) -#define CD_DEVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_DEVICE, CdDevice)) -#define CD_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_DEVICE, CdDeviceClass)) -#define CD_IS_DEVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_DEVICE)) -#define CD_IS_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_DEVICE)) -#define CD_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_DEVICE, CdDeviceClass)) #define CD_DEVICE_ERROR cd_device_error_quark() -typedef struct _CdDevicePrivate CdDevicePrivate; -typedef struct _CdDevice CdDevice; -typedef struct _CdDeviceClass CdDeviceClass; - -struct _CdDevice -{ - GObject parent; - CdDevicePrivate *priv; -}; +#define CD_TYPE_DEVICE (cd_device_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdDevice, cd_device, CD, DEVICE, GObject) struct _CdDeviceClass { @@ -53,7 +40,6 @@ void (* invalidate) (CdDevice *device); }; -GType cd_device_get_type (void); CdDevice *cd_device_new (void); GQuark cd_device_error_quark (void); diff -Nru colord-1.2.12/src/cd-inhibit.c colord-1.3.2/src/cd-inhibit.c --- colord-1.2.12/src/cd-inhibit.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-inhibit.c 2015-10-13 15:24:13.000000000 +0000 @@ -24,22 +24,21 @@ #include #include -#include "cd-cleanup.h" #include "cd-inhibit.h" static void cd_inhibit_finalize (GObject *object); -#define CD_INHIBIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_INHIBIT, CdInhibitPrivate)) +#define GET_PRIVATE(o) (cd_inhibit_get_instance_private (o)) /** * CdInhibitPrivate: * * Private #CdInhibit data **/ -struct _CdInhibitPrivate +typedef struct { GPtrArray *array; -}; +} CdInhibitPrivate; typedef struct { gchar *sender; @@ -54,7 +53,7 @@ static guint signals [SIGNAL_LAST] = { 0 }; -G_DEFINE_TYPE (CdInhibit, cd_inhibit, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdInhibit, cd_inhibit, G_TYPE_OBJECT) /** * cd_inhibit_valid: @@ -62,8 +61,9 @@ gboolean cd_inhibit_valid (CdInhibit *inhibit) { + CdInhibitPrivate *priv = GET_PRIVATE (inhibit); g_return_val_if_fail (CD_IS_INHIBIT (inhibit), FALSE); - return inhibit->priv->array->len == 0; + return priv->array->len == 0; } /** @@ -73,7 +73,7 @@ cd_inhibit_get_bus_names (CdInhibit *inhibit) { CdInhibitItem *item_tmp; - CdInhibitPrivate *priv = inhibit->priv; + CdInhibitPrivate *priv = GET_PRIVATE (inhibit); gchar **bus_names; guint i; @@ -106,7 +106,7 @@ const gchar *sender) { CdInhibitItem *item_tmp; - CdInhibitPrivate *priv = inhibit->priv; + CdInhibitPrivate *priv = GET_PRIVATE (inhibit); guint i; /* find sender */ @@ -124,6 +124,7 @@ gboolean cd_inhibit_remove (CdInhibit *inhibit, const gchar *sender, GError **error) { + CdInhibitPrivate *priv = GET_PRIVATE (inhibit); CdInhibitItem *item; g_return_val_if_fail (CD_IS_INHIBIT (inhibit), FALSE); @@ -139,7 +140,7 @@ } /* remove */ - if (!g_ptr_array_remove (inhibit->priv->array, item)) { + if (!g_ptr_array_remove (priv->array, item)) { g_set_error (error, 1, 0, "cannot remove inhibit item for %s", sender); @@ -161,7 +162,7 @@ gpointer user_data) { CdInhibit *inhibit = CD_INHIBIT (user_data); - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* just remove */ if (!cd_inhibit_remove (inhibit, name, &error)) { @@ -178,6 +179,7 @@ gboolean cd_inhibit_add (CdInhibit *inhibit, const gchar *sender, GError **error) { + CdInhibitPrivate *priv = GET_PRIVATE (inhibit); CdInhibitItem *item; g_return_val_if_fail (CD_IS_INHIBIT (inhibit), FALSE); @@ -202,7 +204,7 @@ cd_inhibit_name_vanished_cb, g_object_ref (inhibit), g_object_unref); - g_ptr_array_add (inhibit->priv->array, item); + g_ptr_array_add (priv->array, item); /* emit signal */ g_debug ("CdInhibit: emit changed"); @@ -225,8 +227,6 @@ G_STRUCT_OFFSET (CdInhibitClass, changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - g_type_class_add_private (klass, sizeof (CdInhibitPrivate)); } /** @@ -235,8 +235,8 @@ static void cd_inhibit_init (CdInhibit *inhibit) { - inhibit->priv = CD_INHIBIT_GET_PRIVATE (inhibit); - inhibit->priv->array = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_inhibit_item_free); + CdInhibitPrivate *priv = GET_PRIVATE (inhibit); + priv->array = g_ptr_array_new_with_free_func ((GDestroyNotify) cd_inhibit_item_free); } /** @@ -246,7 +246,7 @@ cd_inhibit_finalize (GObject *object) { CdInhibit *inhibit = CD_INHIBIT (object); - CdInhibitPrivate *priv = inhibit->priv; + CdInhibitPrivate *priv = GET_PRIVATE (inhibit); g_ptr_array_unref (priv->array); diff -Nru colord-1.2.12/src/cd-inhibit.h colord-1.3.2/src/cd-inhibit.h --- colord-1.2.12/src/cd-inhibit.h 2015-04-22 09:56:47.000000000 +0000 +++ colord-1.3.2/src/cd-inhibit.h 2015-10-13 15:24:13.000000000 +0000 @@ -26,22 +26,8 @@ G_BEGIN_DECLS -#define CD_TYPE_INHIBIT (cd_inhibit_get_type ()) -#define CD_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_INHIBIT, CdInhibit)) -#define CD_INHIBIT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_INHIBIT, CdInhibitClass)) -#define CD_IS_INHIBIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_INHIBIT)) -#define CD_IS_INHIBIT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_INHIBIT)) -#define CD_INHIBIT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_INHIBIT, CdInhibitClass)) - -typedef struct _CdInhibitPrivate CdInhibitPrivate; -typedef struct _CdInhibit CdInhibit; -typedef struct _CdInhibitClass CdInhibitClass; - -struct _CdInhibit -{ - GObject parent; - CdInhibitPrivate *priv; -}; +#define CD_TYPE_INHIBIT (cd_inhibit_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdInhibit, cd_inhibit, CD, INHIBIT, GObject) struct _CdInhibitClass { diff -Nru colord-1.2.12/src/cd-main.c colord-1.3.2/src/cd-main.c --- colord-1.2.12/src/cd-main.c 2015-07-20 09:55:26.000000000 +0000 +++ colord-1.3.2/src/cd-main.c 2016-03-03 09:39:51.000000000 +0000 @@ -33,7 +33,6 @@ #include #endif -#include "cd-cleanup.h" #include "cd-common.h" #include "cd-debug.h" #include "cd-device-array.h" @@ -82,8 +81,8 @@ CdDevice *device_tmp; gboolean ret; guint i; - _cleanup_free_ gchar *object_path_tmp = NULL; - _cleanup_ptrarray_unref_ GPtrArray *devices = NULL; + g_autofree gchar *object_path_tmp = NULL; + g_autoptr(GPtrArray) devices = NULL; /* remove from the array before emitting */ object_path_tmp = g_strdup (cd_profile_get_object_path (profile)); @@ -141,7 +140,7 @@ { GError *error = NULL; gboolean ret; - _cleanup_free_ gchar *object_path_tmp = NULL; + g_autofree gchar *object_path_tmp = NULL; /* remove from the array before emitting */ object_path_tmp = g_strdup (cd_device_get_object_path (device)); @@ -218,7 +217,7 @@ CdObjectScope scope, GError **error) { - _cleanup_object_unref_ CdProfile *profile_tmp = NULL; + g_autoptr(CdProfile) profile_tmp = NULL; g_assert (priv->connection != NULL); @@ -230,7 +229,7 @@ /* add the profile */ if (!cd_main_add_profile (priv, profile_tmp, error)) - return FALSE; + return NULL; /* different persistent scope */ switch (scope) { @@ -248,14 +247,14 @@ CD_CLIENT_ERROR, CD_CLIENT_ERROR_NOT_SUPPORTED, "persistent profiles are no yet supported"); - return FALSE; + return NULL; default: g_warning ("CdMain: Unsupported scope kind: %i", scope); g_set_error (error, CD_CLIENT_ERROR, CD_CLIENT_ERROR_NOT_SUPPORTED, "Unsupported scope kind: %i", scope); - return FALSE; + return NULL; } /* success */ @@ -276,7 +275,7 @@ const gchar **warnings; gboolean ret; guint64 timestamp; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* check device and profile hasn't been manually removed */ profile_id = cd_profile_get_id (profile); @@ -332,7 +331,7 @@ { gboolean ret; guint64 timestamp; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; g_debug ("CdMain: Automatically DB add %s to %s", cd_profile_get_id (profile), @@ -371,7 +370,7 @@ { CdProfile *profile_tmp; guint i; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; /* get all the profiles, and check to see if any of them contain * MAPPING_device_id that matches the device */ @@ -392,12 +391,11 @@ static void cd_main_device_auto_add_from_db (CdMainPrivate *priv, CdDevice *device) { - CdProfile *profile_tmp; const gchar *object_id_tmp; guint64 timestamp; guint i; - _cleanup_error_free_ GError *error = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GPtrArray) array = NULL; /* get data */ array = cd_mapping_db_get_profiles (priv->mapping_db, @@ -411,6 +409,7 @@ /* try to add them */ for (i = 0; i < array->len; i++) { + g_autoptr(CdProfile) profile_tmp = NULL; object_id_tmp = g_ptr_array_index (array, i); /* ensure timestamp is still valid */ @@ -442,7 +441,6 @@ /* does the profile have the correct device metadata */ cd_main_auto_add_from_db (priv, device, profile_tmp); - g_object_unref (profile_tmp); } } @@ -568,8 +566,8 @@ CdDeviceMode mode, GError **error) { - _cleanup_free_ gchar *seat = NULL; - _cleanup_object_unref_ CdDevice *device_tmp = NULL; + g_autofree gchar *seat = NULL; + g_autoptr(CdDevice) device_tmp = NULL; g_assert (priv->connection != NULL); @@ -605,7 +603,7 @@ CdDevice *device; guint i; guint length = 0; - _cleanup_free_ GVariant **variant_array = NULL; + g_autofree GVariant **variant_array = NULL; /* copy the object paths */ variant_array = g_new0 (GVariant *, array->len + 1); @@ -641,7 +639,7 @@ CdProfile *profile; guint i; guint length = 0; - _cleanup_free_ GVariant **variant_array = NULL; + g_autofree GVariant **variant_array = NULL; /* copy the object paths */ variant_array = g_new0 (GVariant *, array->len + 1); @@ -667,7 +665,7 @@ CdSensor *sensor; guint i; guint length = 0; - _cleanup_free_ GVariant **variant_array = NULL; + g_autofree GVariant **variant_array = NULL; /* copy the object paths */ variant_array = g_new0 (GVariant *, array->len + 1); @@ -692,8 +690,8 @@ CdProfile *profile) { guint i; - _cleanup_error_free_ GError *error = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GPtrArray) array = NULL; /* get data */ array = cd_mapping_db_get_devices (priv->mapping_db, @@ -714,7 +712,7 @@ /* try to add them */ for (i = 0; i < array->len; i++) { - CdDevice *device_tmp; + g_autoptr(CdDevice) device_tmp = NULL; const gchar *device_id_tmp; device_id_tmp = g_ptr_array_index (array, i); @@ -727,7 +725,6 @@ /* hard add */ cd_main_auto_add_from_db (priv, device_tmp, profile); - g_object_unref (device_tmp); } } @@ -738,7 +735,7 @@ cd_main_profile_auto_add_from_md (CdMainPrivate *priv, CdProfile *profile) { - _cleanup_object_unref_ CdDevice *device = NULL; + g_autoptr(CdDevice) device = NULL; const gchar *device_id; /* does the device exists that matches the md */ @@ -819,7 +816,7 @@ guint i; guint score_best = 0; guint score_tmp; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; /* get all the profiles with this metadata */ array = cd_profile_array_get_by_metadata (priv->profiles_array, @@ -877,8 +874,8 @@ gchar *cmdline = NULL; gsize len = 0; guint i; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *proc_path = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *proc_path = NULL; /* just read the link */ proc_path = g_strdup_printf ("/proc/%i/cmdline", pid); @@ -927,15 +924,15 @@ guint i; guint pid; guint uid; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *cmdline = NULL; - _cleanup_free_ gchar *device_id_fallback = NULL; - _cleanup_free_ gchar *filename = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; - _cleanup_variant_iter_free_ GVariantIter *iter = NULL; - _cleanup_variant_unref_ GVariant *dict = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *cmdline = NULL; + g_autofree gchar *device_id_fallback = NULL; + g_autofree gchar *filename = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(CdProfile) profile = NULL; + g_autoptr(GPtrArray) array = NULL; + g_autoptr(GVariantIter) iter = NULL; + g_autoptr(GVariant) dict = NULL; /* get the owner of the message */ uid = cd_main_get_sender_uid (connection, sender, &error); @@ -1712,9 +1709,9 @@ const gchar *checksum; const gchar *filename; gboolean ret; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *profile_id = NULL; - _cleanup_object_unref_ CdProfile *profile = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *profile_id = NULL; + g_autoptr(CdProfile) profile = NULL; /* create profile */ profile = cd_profile_new (); @@ -1790,9 +1787,9 @@ const gchar *property; gboolean ret; guint i; - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array_properties = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(CdDevice) device = NULL; + g_autoptr(GPtrArray) array_properties = NULL; device = cd_main_create_device (priv, NULL, @@ -1821,7 +1818,7 @@ return; } for (i = 0; i < array_properties->len; i++) { - _cleanup_free_ gchar *value = NULL; + g_autofree gchar *value = NULL; property = g_ptr_array_index (array_properties, i); value = cd_device_db_get_property (priv->device_db, device_id, @@ -1893,7 +1890,7 @@ { const gchar *id; gboolean ret; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; id = cd_sensor_get_id (sensor); if (id == NULL) { @@ -1973,9 +1970,9 @@ const gchar *device_id; gboolean ret; guint i; - _cleanup_error_free_ GError *error = NULL; - _cleanup_object_unref_ CdSensor *sensor = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array_devices = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(CdSensor) sensor = NULL; + g_autoptr(GPtrArray) array_devices = NULL; g_debug ("CdMain: acquired name: %s", name); @@ -2117,8 +2114,8 @@ static GDBusNodeInfo * cd_main_load_introspection (const gchar *filename, GError **error) { - _cleanup_bytes_unref_ GBytes *data = NULL; - _cleanup_free_ gchar *path = NULL; + g_autoptr(GBytes) data = NULL; + g_autofree gchar *path = NULL; /* lookup data */ path = g_build_filename ("/org/freedesktop/colord", filename, NULL); @@ -2154,7 +2151,7 @@ { CdMainPrivate *priv = (CdMainPrivate *) user_data; gboolean ret; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; cd_device_set_mode (device, CD_DEVICE_MODE_PHYSICAL); ret = cd_main_device_add (priv, device, NULL, &error); @@ -2260,9 +2257,9 @@ { const gchar *filename_tmp; gboolean ret; - _cleanup_dir_close_ GDir *dir = NULL; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *path = NULL; + g_autoptr(GDir) dir = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *path = NULL; /* search in the plugin directory for plugins */ path = g_build_filename (LIBDIR, "colord-plugins", NULL); @@ -2276,7 +2273,7 @@ /* try to open each plugin */ g_debug ("searching for plugins in %s", path); do { - _cleanup_free_ gchar *filename_plugin = NULL; + g_autofree gchar *filename_plugin = NULL; filename_tmp = g_dir_read_name (dir); if (filename_tmp == NULL) break; @@ -2311,13 +2308,13 @@ { gboolean ret; gsize len = 0; - _cleanup_bytes_unref_ GBytes *data = NULL; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *edid_data = NULL; - _cleanup_free_ gchar *edid_fn = NULL; - _cleanup_free_ gchar *enabled_data = NULL; - _cleanup_free_ gchar *enabled_fn = NULL; - _cleanup_object_unref_ CdEdid *edid = NULL; + g_autoptr(GBytes) data = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *edid_data = NULL; + g_autofree gchar *edid_fn = NULL; + g_autofree gchar *enabled_data = NULL; + g_autofree gchar *enabled_fn = NULL; + g_autoptr(CdEdid) edid = NULL; /* check output is actually an output */ enabled_fn = g_build_filename ("/sys/class/drm", @@ -2385,8 +2382,8 @@ { const gchar *fn; gboolean use_xrandr_mode = FALSE; - _cleanup_dir_close_ GDir *dir = NULL; - _cleanup_hashtable_unref_ GHashTable *hash = NULL; + g_autoptr(GDir) dir = NULL; + g_autoptr(GHashTable) hash = NULL; dir = g_dir_open ("/sys/class/drm", 0, NULL); if (dir == NULL) @@ -2396,7 +2393,7 @@ hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); while (!use_xrandr_mode && (fn = g_dir_read_name (dir)) != NULL) { gpointer old_output; - _cleanup_object_unref_ CdEdid *edid = NULL; + g_autoptr(CdEdid) edid = NULL; edid = cd_main_get_edid_for_output (fn); if (edid == NULL) continue; @@ -2423,7 +2420,7 @@ { gboolean ret; gchar *data = NULL; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* get the contents */ ret = g_file_get_contents (filename, &data, NULL, &error); @@ -2479,7 +2476,7 @@ "/sys/class/dmi/id/chassis_vendor", "/sys/class/dmi/id/board_vendor", NULL}; - _cleanup_free_ gchar *tmp = NULL; + g_autofree gchar *tmp = NULL; /* get vendor name */ tmp = cd_main_dmi_get_from_filenames (sysfs_vendor); @@ -2498,7 +2495,7 @@ "/sys/class/dmi/id/board_name", NULL}; gchar *model; - _cleanup_free_ gchar *tmp = NULL; + g_autofree gchar *tmp = NULL; /* thinkpad puts the common name in the version field, urgh */ tmp = cd_main_dmi_get_from_filename ("/sys/class/dmi/id/product_version"); @@ -2548,7 +2545,7 @@ _("Create a dummy sensor for testing"), NULL }, { NULL} }; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; setlocale (LC_ALL, ""); diff -Nru colord-1.2.12/src/cd-mapping-db.c colord-1.3.2/src/cd-mapping-db.c --- colord-1.2.12/src/cd-mapping-db.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-mapping-db.c 2015-10-13 15:24:13.000000000 +0000 @@ -25,22 +25,21 @@ #include #include -#include "cd-cleanup.h" #include "cd-common.h" #include "cd-mapping-db.h" static void cd_mapping_db_finalize (GObject *object); -#define CD_MAPPING_DB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_MAPPING_DB, CdMappingDbPrivate)) +#define GET_PRIVATE(o) (cd_mapping_db_get_instance_private (o)) -struct CdMappingDbPrivate +typedef struct { sqlite3 *db; -}; +} CdMappingDbPrivate; static gpointer cd_mapping_db_object = NULL; -G_DEFINE_TYPE (CdMappingDb, cd_mapping_db, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdMappingDb, cd_mapping_db, G_TYPE_OBJECT) /** * cd_mapping_db_convert_cb: @@ -49,13 +48,14 @@ cd_mapping_db_convert_cb (void *data, gint argc, gchar **argv, gchar **col_name) { CdMappingDb *mdb = (CdMappingDb *) data; + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); gchar *statement; gint rc; statement = sqlite3_mprintf ("INSERT INTO mappings_v2 (device, profile, timestamp) " "VALUES ('%q', '%q', '%q')", argv[0], argv[1], argv[2]); - rc = sqlite3_exec (mdb->priv->db, statement, + rc = sqlite3_exec (priv->db, statement, NULL, NULL, NULL); sqlite3_free (statement); return rc; @@ -69,13 +69,14 @@ const gchar *filename, GError **error) { + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); const gchar *statement; gchar *error_msg = NULL; gint rc; - _cleanup_free_ gchar *path = NULL; + g_autofree gchar *path = NULL; g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), FALSE); - g_return_val_if_fail (mdb->priv->db == NULL, FALSE); + g_return_val_if_fail (priv->db == NULL, FALSE); /* ensure the path exists */ path = g_path_get_dirname (filename); @@ -84,23 +85,23 @@ g_debug ("CdMappingDb: trying to open database '%s'", filename); g_info ("Using mapping database file %s", filename); - rc = sqlite3_open (filename, &mdb->priv->db); + rc = sqlite3_open (filename, &priv->db); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, CD_CLIENT_ERROR_INTERNAL, "Can't open database: %s\n", - sqlite3_errmsg (mdb->priv->db)); - sqlite3_close (mdb->priv->db); + sqlite3_errmsg (priv->db)); + sqlite3_close (priv->db); return FALSE; } /* we don't need to keep doing fsync */ - sqlite3_exec (mdb->priv->db, "PRAGMA synchronous=OFF", + sqlite3_exec (priv->db, "PRAGMA synchronous=OFF", NULL, NULL, NULL); /* check mappings */ - rc = sqlite3_exec (mdb->priv->db, "SELECT * FROM mappings LIMIT 1", + rc = sqlite3_exec (priv->db, "SELECT * FROM mappings LIMIT 1", NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_debug ("CdMappingDb: creating table to repair: %s", error_msg); @@ -109,22 +110,22 @@ "timestamp INTEGER DEFAULT 0," "device TEXT," "profile TEXT);"; - sqlite3_exec (mdb->priv->db, statement, NULL, NULL, NULL); + sqlite3_exec (priv->db, statement, NULL, NULL, NULL); } /* check mappings has timestamp (since 0.1.8) */ - rc = sqlite3_exec (mdb->priv->db, + rc = sqlite3_exec (priv->db, "SELECT timestamp FROM mappings LIMIT 1", NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_debug ("CdMappingDb: altering table to repair: %s", error_msg); sqlite3_free (error_msg); statement = "ALTER TABLE mappings ADD COLUMN timestamp INTEGER DEFAULT 0;"; - sqlite3_exec (mdb->priv->db, statement, NULL, NULL, NULL); + sqlite3_exec (priv->db, statement, NULL, NULL, NULL); } /* check mappings version 2 exists (since 0.1.29) */ - rc = sqlite3_exec (mdb->priv->db, "SELECT * FROM mappings_v2 LIMIT 1", + rc = sqlite3_exec (priv->db, "SELECT * FROM mappings_v2 LIMIT 1", NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_debug ("CdMappingDb: altering table to convert: %s", error_msg); @@ -134,11 +135,11 @@ "device TEXT," "profile TEXT," "PRIMARY KEY (device, profile));"; - sqlite3_exec (mdb->priv->db, statement, NULL, NULL, NULL); + sqlite3_exec (priv->db, statement, NULL, NULL, NULL); /* copy all the mapping data from v1 to v2 */ statement = "SELECT device, profile, timestamp FROM mappings;"; - rc = sqlite3_exec (mdb->priv->db, + rc = sqlite3_exec (priv->db, statement, cd_mapping_db_convert_cb, mdb, @@ -155,7 +156,7 @@ /* remove old table data */ statement = "DELETE FROM mappings;"; - rc = sqlite3_exec (mdb->priv->db, statement, + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, @@ -177,15 +178,16 @@ cd_mapping_db_empty (CdMappingDb *mdb, GError **error) { + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); const gchar *statement; gchar *error_msg = NULL; gint rc; g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), FALSE); - g_return_val_if_fail (mdb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); statement = "DELETE FROM mappings_v2;"; - rc = sqlite3_exec (mdb->priv->db, statement, + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, @@ -208,6 +210,7 @@ const gchar *profile_id, GError **error) { + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement; @@ -215,7 +218,7 @@ gint64 timestamp; g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), FALSE); - g_return_val_if_fail (mdb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); g_debug ("CdMappingDb: add %s<=>%s", device_id, profile_id); @@ -225,7 +228,7 @@ device_id, profile_id, timestamp); /* insert the entry */ - rc = sqlite3_exec (mdb->priv->db, statement, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -255,13 +258,14 @@ const gchar *profile_id, GError **error) { + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement; gint rc; g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), FALSE); - g_return_val_if_fail (mdb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); g_debug ("CdMappingDb: clearing timestamp %s<=>%s", device_id, profile_id); @@ -270,7 +274,7 @@ device_id, profile_id); /* update the entry */ - rc = sqlite3_exec (mdb->priv->db, statement, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -298,13 +302,14 @@ const gchar *profile_id, GError **error) { + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement; gint rc; g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), FALSE); - g_return_val_if_fail (mdb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); g_debug ("CdMappingDb: remove %s<=>%s", device_id, profile_id); statement = sqlite3_mprintf ("DELETE FROM mappings_v2 WHERE " @@ -312,7 +317,7 @@ device_id, profile_id); /* remove the entry */ - rc = sqlite3_exec (mdb->priv->db, statement, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -356,14 +361,15 @@ const gchar *device_id, GError **error) { + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); gchar *error_msg = NULL; gchar *statement; gint rc; GPtrArray *array = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array_tmp = NULL; + g_autoptr(GPtrArray) array_tmp = NULL; g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), NULL); - g_return_val_if_fail (mdb->priv->db != NULL, NULL); + g_return_val_if_fail (priv->db != NULL, NULL); g_debug ("CdMappingDb: get profiles for %s", device_id); statement = sqlite3_mprintf ("SELECT profile FROM mappings_v2 WHERE " @@ -372,7 +378,7 @@ /* remove the entry */ array_tmp = g_ptr_array_new_with_free_func (g_free); - rc = sqlite3_exec (mdb->priv->db, + rc = sqlite3_exec (priv->db, statement, cd_mapping_db_sqlite_cb, array_tmp, @@ -405,14 +411,15 @@ const gchar *profile_id, GError **error) { + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); gchar *error_msg = NULL; gchar *statement; gint rc; GPtrArray *array = NULL; - _cleanup_ptrarray_unref_ GPtrArray *array_tmp = NULL; + g_autoptr(GPtrArray) array_tmp = NULL; g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), NULL); - g_return_val_if_fail (mdb->priv->db != NULL, NULL); + g_return_val_if_fail (priv->db != NULL, NULL); g_debug ("CdMappingDb: get devices for %s", profile_id); statement = sqlite3_mprintf ("SELECT device FROM mappings_v2 WHERE " @@ -421,7 +428,7 @@ /* remove the entry */ array_tmp = g_ptr_array_new_with_free_func (g_free); - rc = sqlite3_exec (mdb->priv->db, + rc = sqlite3_exec (priv->db, statement, cd_mapping_db_sqlite_cb, array_tmp, @@ -473,13 +480,14 @@ const gchar *profile_id, GError **error) { + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); gchar *error_msg = NULL; gchar *statement; gint rc; guint64 timestamp = G_MAXUINT64; g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), G_MAXUINT64); - g_return_val_if_fail (mdb->priv->db != NULL, G_MAXUINT64); + g_return_val_if_fail (priv->db != NULL, G_MAXUINT64); g_debug ("CdMappingDb: get checksum for %s<->%s", device_id, profile_id); @@ -488,7 +496,7 @@ "LIMIT 1;", device_id, profile_id); /* query the checksum */ - rc = sqlite3_exec (mdb->priv->db, + rc = sqlite3_exec (priv->db, statement, cd_mapping_db_sqlite_timestamp_cb, ×tamp, @@ -526,7 +534,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = cd_mapping_db_finalize; - g_type_class_add_private (klass, sizeof (CdMappingDbPrivate)); } /** @@ -535,7 +542,6 @@ static void cd_mapping_db_init (CdMappingDb *mdb) { - mdb->priv = CD_MAPPING_DB_GET_PRIVATE (mdb); } /** @@ -545,13 +551,11 @@ static void cd_mapping_db_finalize (GObject *object) { - CdMappingDb *mdb; - g_return_if_fail (CD_IS_MAPPING_DB (object)); - mdb = CD_MAPPING_DB (object); - g_return_if_fail (mdb->priv != NULL); + CdMappingDb *mdb = CD_MAPPING_DB (object); + CdMappingDbPrivate *priv = GET_PRIVATE (mdb); /* close the database */ - sqlite3_close (mdb->priv->db); + sqlite3_close (priv->db); G_OBJECT_CLASS (cd_mapping_db_parent_class)->finalize (object); } diff -Nru colord-1.2.12/src/cd-mapping-db.h colord-1.3.2/src/cd-mapping-db.h --- colord-1.2.12/src/cd-mapping-db.h 2015-04-22 09:56:47.000000000 +0000 +++ colord-1.3.2/src/cd-mapping-db.h 2015-10-13 15:24:13.000000000 +0000 @@ -26,27 +26,14 @@ G_BEGIN_DECLS -#define CD_TYPE_MAPPING_DB (cd_mapping_db_get_type ()) -#define CD_MAPPING_DB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_MAPPING_DB, CdMappingDb)) -#define CD_MAPPING_DB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_MAPPING_DB, CdMappingDbClass)) -#define CD_IS_MAPPING_DB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_MAPPING_DB)) -#define CD_IS_MAPPING_DB_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_MAPPING_DB)) -#define CD_MAPPING_DB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_MAPPING_DB, CdMappingDbClass)) +#define CD_TYPE_MAPPING_DB (cd_mapping_db_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdMappingDb, cd_mapping_db, CD, MAPPING_DB, GObject) -typedef struct CdMappingDbPrivate CdMappingDbPrivate; - -typedef struct -{ - GObject parent; - CdMappingDbPrivate *priv; -} CdMappingDb; - -typedef struct +struct _CdMappingDbClass { GObjectClass parent_class; -} CdMappingDbClass; +}; -GType cd_mapping_db_get_type (void); CdMappingDb *cd_mapping_db_new (void); gboolean cd_mapping_db_load (CdMappingDb *mdb, diff -Nru colord-1.2.12/src/cd-profile-array.c colord-1.3.2/src/cd-profile-array.c --- colord-1.2.12/src/cd-profile-array.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-profile-array.c 2015-10-13 15:24:13.000000000 +0000 @@ -28,19 +28,19 @@ static void cd_profile_array_finalize (GObject *object); -#define CD_PROFILE_ARRAY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_PROFILE_ARRAY, CdProfileArrayPrivate)) +#define GET_PRIVATE(o) (cd_profile_array_get_instance_private (o)) /** * CdProfileArrayPrivate: * * Private #CdProfileArray data **/ -struct _CdProfileArrayPrivate +typedef struct { GPtrArray *array; -}; +} CdProfileArrayPrivate; -G_DEFINE_TYPE (CdProfileArray, cd_profile_array, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdProfileArray, cd_profile_array, G_TYPE_OBJECT) static gpointer cd_profile_array_object = NULL; @@ -50,11 +50,10 @@ void cd_profile_array_add (CdProfileArray *profile_array, CdProfile *profile) { + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); g_return_if_fail (CD_IS_PROFILE_ARRAY (profile_array)); g_return_if_fail (CD_IS_PROFILE (profile)); - - g_ptr_array_add (profile_array->priv->array, - g_object_ref (profile)); + g_ptr_array_add (priv->array, g_object_ref (profile)); } /** @@ -63,11 +62,10 @@ void cd_profile_array_remove (CdProfileArray *profile_array, CdProfile *profile) { + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); g_return_if_fail (CD_IS_PROFILE_ARRAY (profile_array)); g_return_if_fail (CD_IS_PROFILE (profile)); - - g_ptr_array_remove (profile_array->priv->array, - profile); + g_ptr_array_remove (priv->array, profile); } /** @@ -78,7 +76,7 @@ const gchar *id, guint owner) { - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); CdProfile *profile_tmp; guint i; @@ -105,7 +103,7 @@ cd_profile_array_get_by_basename (CdProfileArray *profile_array, const gchar *filename) { - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); CdProfile *profile = NULL; CdProfile *profile_tmp; const gchar *tmp; @@ -133,7 +131,7 @@ cd_profile_array_get_by_filename (CdProfileArray *profile_array, const gchar *filename) { - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); CdProfile *profile_tmp; guint i; @@ -160,7 +158,7 @@ const gchar *key, const gchar *value) { - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); CdProfile *profile_tmp; guint i; @@ -184,7 +182,7 @@ cd_profile_array_get_by_kind (CdProfileArray *profile_array, CdProfileKind kind) { - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); CdProfile *profile_tmp; GPtrArray *array; guint i; @@ -207,7 +205,7 @@ const gchar *key, const gchar *value) { - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); CdProfile *profile_tmp; GPtrArray *array; GHashTable *hash_tmp; @@ -233,7 +231,7 @@ cd_profile_array_get_by_object_path (CdProfileArray *profile_array, const gchar *object_path) { - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); CdProfile *profile = NULL; CdProfile *profile_tmp; guint i; @@ -253,7 +251,7 @@ GVariant * cd_profile_array_get_variant (CdProfileArray *profile_array) { - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); CdProfile *profile; GVariant **variant_array = NULL; guint i; @@ -279,8 +277,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = cd_profile_array_finalize; - - g_type_class_add_private (klass, sizeof (CdProfileArrayPrivate)); } /** @@ -289,8 +285,8 @@ static void cd_profile_array_init (CdProfileArray *profile_array) { - profile_array->priv = CD_PROFILE_ARRAY_GET_PRIVATE (profile_array); - profile_array->priv->array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); + priv->array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); } /** @@ -300,7 +296,7 @@ cd_profile_array_finalize (GObject *object) { CdProfileArray *profile_array = CD_PROFILE_ARRAY (object); - CdProfileArrayPrivate *priv = profile_array->priv; + CdProfileArrayPrivate *priv = GET_PRIVATE (profile_array); g_ptr_array_unref (priv->array); diff -Nru colord-1.2.12/src/cd-profile-array.h colord-1.3.2/src/cd-profile-array.h --- colord-1.2.12/src/cd-profile-array.h 2015-04-22 09:56:47.000000000 +0000 +++ colord-1.3.2/src/cd-profile-array.h 2015-10-13 15:24:13.000000000 +0000 @@ -28,29 +28,14 @@ G_BEGIN_DECLS -#define CD_TYPE_PROFILE_ARRAY (cd_profile_array_get_type ()) -#define CD_PROFILE_ARRAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_PROFILE_ARRAY, CdProfileArray)) -#define CD_PROFILE_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_PROFILE_ARRAY, CdProfileArrayClass)) -#define CD_IS_PROFILE_ARRAY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_PROFILE_ARRAY)) -#define CD_IS_PROFILE_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_PROFILE_ARRAY)) -#define CD_PROFILE_ARRAY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_PROFILE_ARRAY, CdProfileArrayClass)) - -typedef struct _CdProfileArrayPrivate CdProfileArrayPrivate; -typedef struct _CdProfileArray CdProfileArray; -typedef struct _CdProfileArrayClass CdProfileArrayClass; - -struct _CdProfileArray -{ - GObject parent; - CdProfileArrayPrivate *priv; -}; +#define CD_TYPE_PROFILE_ARRAY (cd_profile_array_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdProfileArray, cd_profile_array, CD, PROFILE_ARRAY, GObject) struct _CdProfileArrayClass { GObjectClass parent_class; }; -GType cd_profile_array_get_type (void); CdProfileArray *cd_profile_array_new (void); void cd_profile_array_add (CdProfileArray *profile_array, diff -Nru colord-1.2.12/src/cd-profile.c colord-1.3.2/src/cd-profile.c --- colord-1.2.12/src/cd-profile.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-profile.c 2015-10-13 15:24:13.000000000 +0000 @@ -31,7 +31,6 @@ #endif #include -#include "cd-cleanup.h" #include "cd-common.h" #include "cd-profile.h" #include "cd-profile-db.h" @@ -41,14 +40,14 @@ static void cd_profile_set_filename (CdProfile *profile, const gchar *filename); -#define CD_PROFILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_PROFILE, CdProfilePrivate)) +#define GET_PRIVATE(o) (cd_profile_get_instance_private (o)) /** * CdProfilePrivate: * * Private #CdProfile data **/ -struct _CdProfilePrivate +typedef struct { CdObjectScope object_scope; gchar *filename; @@ -72,7 +71,7 @@ GMappedFile *mapped_file; guint score; CdProfileDb *db; -}; +} CdProfilePrivate; enum { SIGNAL_INVALIDATE, @@ -90,7 +89,7 @@ }; static guint signals[SIGNAL_LAST] = { 0 }; -G_DEFINE_TYPE (CdProfile, cd_profile, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdProfile, cd_profile, G_TYPE_OBJECT) /** * cd_profile_error_quark: @@ -117,8 +116,9 @@ CdObjectScope cd_profile_get_scope (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), 0); - return profile->priv->object_scope; + return priv->object_scope; } /** @@ -127,8 +127,9 @@ void cd_profile_set_scope (CdProfile *profile, CdObjectScope object_scope) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (profile)); - profile->priv->object_scope = object_scope; + priv->object_scope = object_scope; } /** @@ -137,8 +138,9 @@ guint cd_profile_get_owner (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), G_MAXUINT); - return profile->priv->owner; + return priv->owner; } /** @@ -147,8 +149,9 @@ void cd_profile_set_owner (CdProfile *profile, guint owner) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (profile)); - profile->priv->owner = owner; + priv->owner = owner; } /** @@ -157,11 +160,12 @@ void cd_profile_set_is_system_wide (CdProfile *profile, gboolean is_system_wide) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (profile)); - profile->priv->is_system_wide = is_system_wide; + priv->is_system_wide = is_system_wide; /* by default, prefer systemwide profiles over user profiles */ - profile->priv->score += 1; + priv->score += 1; } /** @@ -170,8 +174,9 @@ gboolean cd_profile_get_is_system_wide (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - return profile->priv->is_system_wide; + return priv->is_system_wide; } /** @@ -180,8 +185,9 @@ const gchar * cd_profile_get_object_path (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return profile->priv->object_path; + return priv->object_path; } /** @@ -190,8 +196,9 @@ const gchar * cd_profile_get_id (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return profile->priv->id; + return priv->id; } /** @@ -200,37 +207,38 @@ static void cd_profile_set_object_path (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); #ifdef HAVE_PWD_H struct passwd *pw; #endif - _cleanup_free_ gchar *path_tmp = NULL; - _cleanup_free_ gchar *path_owner = NULL; + g_autofree gchar *path_tmp = NULL; + g_autofree gchar *path_owner = NULL; /* append the uid to the object path */ #ifdef HAVE_PWD_H - pw = getpwuid (profile->priv->owner); - if (profile->priv->owner == 0 || + pw = getpwuid (priv->owner); + if (priv->owner == 0 || g_strcmp0 (pw->pw_name, DAEMON_USER) == 0) { - path_tmp = g_strdup (profile->priv->id); + path_tmp = g_strdup (priv->id); } else { path_tmp = g_strdup_printf ("%s_%s_%d", - profile->priv->id, + priv->id, pw->pw_name, - profile->priv->owner); + priv->owner); } #else - if (profile->priv->owner == 0) { - path_tmp = g_strdup (profile->priv->id); + if (priv->owner == 0) { + path_tmp = g_strdup (priv->id); } else { path_tmp = g_strdup_printf ("%s_%d", - profile->priv->id, - profile->priv->owner); + priv->id, + priv->owner); } #endif /* make sure object path is sane */ path_owner = cd_main_ensure_dbus_path (path_tmp); - profile->priv->object_path = g_build_filename (COLORD_DBUS_PATH, + priv->object_path = g_build_filename (COLORD_DBUS_PATH, "profiles", path_owner, NULL); @@ -244,10 +252,11 @@ const gchar *property, const gchar *value) { + CdProfilePrivate *priv = GET_PRIVATE (profile); /* i1Profiler sets this */ if (g_strcmp0 (property, "CreatorApp") == 0) property = CD_PROFILE_METADATA_CMF_PRODUCT; - g_hash_table_insert (profile->priv->metadata, + g_hash_table_insert (priv->metadata, g_strdup (property), g_strdup (value)); } @@ -258,43 +267,45 @@ void cd_profile_set_id (CdProfile *profile, const gchar *id) { + CdProfilePrivate *priv = GET_PRIVATE (profile); + CdStandardSpace standard_space = CD_STANDARD_SPACE_UNKNOWN; g_return_if_fail (CD_IS_PROFILE (profile)); - g_free (profile->priv->id); - profile->priv->id = g_strdup (id); + g_free (priv->id); + priv->id = g_strdup (id); /* all profiles have a score initially */ - profile->priv->score = 1; + priv->score = 1; /* http://www.color.org/srgbprofiles.xalter */ if (g_strcmp0 (id, "icc-34562abf994ccd066d2c5721d0d68c5d") == 0) { /* sRGB_v4_ICC_preference */ standard_space = CD_STANDARD_SPACE_SRGB; - profile->priv->score = 10; + priv->score = 10; } if (g_strcmp0 (id, "icc-fc66337837e2886bfd72e9838228f1b8") == 0) { /* sRGB_v4_ICC_preference_displayclass */ standard_space = CD_STANDARD_SPACE_SRGB; - profile->priv->score = 8; + priv->score = 8; } if (g_strcmp0 (id, "icc-29f83ddeaff255ae7842fae4ca83390d") == 0) { /* sRGB_IEC61966-2-1_black_scaled */ standard_space = CD_STANDARD_SPACE_SRGB; - profile->priv->score = 6; + priv->score = 6; } if (g_strcmp0 (id, "icc-c95bd637e95d8a3b0df38f99c1320389") == 0) { /* sRGB_IEC61966-2-1_no_black_scaling */ standard_space = CD_STANDARD_SPACE_SRGB; - profile->priv->score = 4; + priv->score = 4; } /* from http://download.adobe.com/pub/adobe/iccprofiles/ */ if (g_strcmp0 (id, "icc-dea88382d899d5f6e573b432473ae138") == 0) { /* AdobeRGB1998 */ standard_space = CD_STANDARD_SPACE_ADOBE_RGB; - profile->priv->score = 10; + priv->score = 10; } if (g_strcmp0 (id, "icc-91cf26c58e07eda724fdbf3eadce4505") == 0) { /* ColorMatchRGB */ @@ -325,8 +336,9 @@ const gchar * cd_profile_get_filename (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return profile->priv->filename; + return priv->filename; } /** @@ -337,11 +349,12 @@ const gchar *property_name, GVariant *property_value) { + CdProfilePrivate *priv = GET_PRIVATE (profile); GVariantBuilder builder; GVariantBuilder invalidated_builder; /* not yet connected */ - if (profile->priv->connection == NULL) + if (priv->connection == NULL) return; /* build the dict */ @@ -351,9 +364,9 @@ "{sv}", property_name, property_value); - g_dbus_connection_emit_signal (profile->priv->connection, + g_dbus_connection_emit_signal (priv->connection, NULL, - profile->priv->object_path, + priv->object_path, "org.freedesktop.DBus.Properties", "PropertiesChanged", g_variant_new ("(sa{sv}as)", @@ -371,14 +384,16 @@ static void cd_profile_dbus_emit_profile_changed (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); + /* not yet connected */ - if (profile->priv->connection == NULL) + if (priv->connection == NULL) return; /* emit signal */ g_debug ("CdProfile: emit Changed on %s", cd_profile_get_object_path (profile)); - g_dbus_connection_emit_signal (profile->priv->connection, + g_dbus_connection_emit_signal (priv->connection, NULL, cd_profile_get_object_path (profile), COLORD_DBUS_INTERFACE_PROFILE, @@ -388,7 +403,7 @@ /* emit signal */ g_debug ("CdProfile: emit Changed"); - g_dbus_connection_emit_signal (profile->priv->connection, + g_dbus_connection_emit_signal (priv->connection, NULL, COLORD_DBUS_PATH, COLORD_DBUS_INTERFACE, @@ -404,13 +419,13 @@ static gboolean cd_profile_install_system_wide (CdProfile *profile, GError **error) { - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); gboolean ret = TRUE; - _cleanup_error_free_ GError *error_local = NULL; - _cleanup_free_ gchar *basename = NULL; - _cleanup_free_ gchar *filename = NULL; - _cleanup_object_unref_ GFile *file_dest = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GError) error_local = NULL; + g_autofree gchar *basename = NULL; + g_autofree gchar *filename = NULL; + g_autoptr(GFile) file_dest = NULL; + g_autoptr(GFile) file = NULL; /* is icc filename set? */ if (priv->filename == NULL) { @@ -493,22 +508,23 @@ static GVariant * cd_profile_get_metadata_as_variant (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); GList *l; GVariantBuilder builder; - _cleanup_list_free_ GList *list = NULL; + g_autoptr(GList) list = NULL; /* do not try to build an empty array */ - if (g_hash_table_size (profile->priv->metadata) == 0) + if (g_hash_table_size (priv->metadata) == 0) return g_variant_new_array (G_VARIANT_TYPE ("{ss}"), NULL, 0); /* add all the keys in the dictionary to the variant builder */ - list = g_hash_table_get_keys (profile->priv->metadata); + list = g_hash_table_get_keys (priv->metadata); g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); for (l = list; l != NULL; l = l->next) { g_variant_builder_add (&builder, "{ss}", l->data, - g_hash_table_lookup (profile->priv->metadata, + g_hash_table_lookup (priv->metadata, l->data)); } return g_variant_builder_end (&builder); @@ -534,7 +550,7 @@ guint sender_uid, GError **error) { - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); /* check title is suitable */ if (value == NULL || strlen (value) < 3 || @@ -562,7 +578,7 @@ guint sender_uid, GError **error) { - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); /* sanity check the length of the key and value */ if (strlen (property) > CD_DBUS_METADATA_KEY_LEN_MAX) { @@ -629,11 +645,12 @@ GDBusMethodInvocation *invocation, gpointer user_data) { CdProfile *profile = CD_PROFILE (user_data); + CdProfilePrivate *priv = GET_PRIVATE (profile); gboolean ret; guint uid; const gchar *property_name = NULL; const gchar *property_value = NULL; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* return '' */ if (g_strcmp0 (method_name, "SetProperty") == 0) { @@ -694,7 +711,7 @@ /* require auth */ g_debug ("CdProfile %s:InstallSystemWide() on %s", - sender, profile->priv->object_path); + sender, priv->object_path); ret = cd_main_sender_authenticated (connection, sender, "org.freedesktop.color-manager.install-system-wide", @@ -733,12 +750,12 @@ gpointer user_data) { CdProfile *profile = CD_PROFILE (user_data); - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); gboolean ret; if (g_strcmp0 (property_name, CD_PROFILE_PROPERTY_TITLE) == 0) { guint uid; - _cleanup_free_ gchar *title_db = NULL; + g_autofree gchar *title_db = NULL; uid = cd_main_get_sender_uid (connection, sender, error); if (uid == G_MAXUINT) @@ -802,7 +819,8 @@ GDBusInterfaceInfo *info, GError **error) { - _cleanup_error_free_ GError *error_local = NULL; + CdProfilePrivate *priv = GET_PRIVATE (profile); + g_autoptr(GError) error_local = NULL; static const GDBusInterfaceVTable interface_vtable = { cd_profile_dbus_method_call, @@ -810,16 +828,16 @@ NULL }; - profile->priv->connection = connection; - profile->priv->registration_id = g_dbus_connection_register_object ( + priv->connection = connection; + priv->registration_id = g_dbus_connection_register_object ( connection, - profile->priv->object_path, + priv->object_path, info, &interface_vtable, profile, /* user_data */ NULL, /* user_data_free_func */ &error_local); /* GError** */ - if (profile->priv->registration_id == 0) { + if (priv->registration_id == 0) { g_set_error (error, CD_PROFILE_ERROR, CD_PROFILE_ERROR_INTERNAL, @@ -875,7 +893,7 @@ static gboolean cd_profile_set_from_profile (CdProfile *profile, CdIcc *icc, GError **error) { - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); CdProfileWarning warning; GList *l; cmsHPROFILE lcms_profile; @@ -884,9 +902,9 @@ gboolean ret = FALSE; guint i; struct tm created; - _cleanup_array_unref_ GArray *flags = NULL; - _cleanup_hashtable_unref_ GHashTable *metadata = NULL; - _cleanup_list_free_ GList *keys = NULL; + g_autoptr(GArray) flags = NULL; + g_autoptr(GHashTable) metadata = NULL; + g_autoptr(GList) keys = NULL; /* get the description as the title */ value = cd_icc_get_description (icc, NULL, error); @@ -964,7 +982,8 @@ const gchar ** cd_profile_get_warnings (CdProfile *profile) { - return (const gchar **) profile->priv->warnings; + CdProfilePrivate *priv = GET_PRIVATE (profile); + return (const gchar **) priv->warnings; } /** @@ -973,7 +992,7 @@ static void cd_profile_emit_parsed_property_changed (CdProfile *profile) { - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); cd_profile_dbus_emit_property_changed (profile, CD_PROFILE_PROPERTY_FILENAME, @@ -1032,10 +1051,10 @@ gint fd, GError **error) { - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); gboolean ret; - _cleanup_error_free_ GError *error_local = NULL; - _cleanup_object_unref_ CdIcc *icc = NULL; + g_autoptr(GError) error_local = NULL; + g_autoptr(CdIcc) icc = NULL; g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); @@ -1088,11 +1107,11 @@ gboolean cd_profile_load_from_filename (CdProfile *profile, const gchar *filename, GError **error) { - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); gboolean ret = FALSE; - _cleanup_error_free_ GError *error_local = NULL; - _cleanup_object_unref_ CdIcc *icc = NULL; - _cleanup_object_unref_ GFile *file = NULL; + g_autoptr(GError) error_local = NULL; + g_autoptr(CdIcc) icc = NULL; + g_autoptr(GFile) file = NULL; g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); @@ -1147,8 +1166,9 @@ const gchar * cd_profile_get_qualifier (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return profile->priv->qualifier; + return priv->qualifier; } /** @@ -1157,9 +1177,10 @@ void cd_profile_set_qualifier (CdProfile *profile, const gchar *qualifier) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (profile)); - g_free (profile->priv->qualifier); - profile->priv->qualifier = g_strdup (qualifier); + g_free (priv->qualifier); + priv->qualifier = g_strdup (qualifier); } /** @@ -1168,9 +1189,10 @@ void cd_profile_set_format (CdProfile *profile, const gchar *format) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (profile)); - g_free (profile->priv->format); - profile->priv->format = g_strdup (format); + g_free (priv->format); + priv->format = g_strdup (format); } /** @@ -1179,9 +1201,10 @@ static void cd_profile_set_filename (CdProfile *profile, const gchar *filename) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (profile)); - g_free (profile->priv->filename); - profile->priv->filename = g_strdup (filename); + g_free (priv->filename); + priv->filename = g_strdup (filename); } /** @@ -1190,8 +1213,9 @@ const gchar * cd_profile_get_title (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return profile->priv->title; + return priv->title; } /** @@ -1200,8 +1224,9 @@ GHashTable * cd_profile_get_metadata (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return profile->priv->metadata; + return priv->metadata; } /** @@ -1210,8 +1235,9 @@ const gchar * cd_profile_get_metadata_item (CdProfile *profile, const gchar *key) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return g_hash_table_lookup (profile->priv->metadata, key); + return g_hash_table_lookup (priv->metadata, key); } /** @@ -1226,8 +1252,9 @@ guint cd_profile_get_score (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), 0); - return profile->priv->score; + return priv->score; } /** @@ -1236,8 +1263,9 @@ CdProfileKind cd_profile_get_kind (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), 0); - return profile->priv->kind; + return priv->kind; } /** @@ -1246,8 +1274,9 @@ CdColorspace cd_profile_get_colorspace (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), 0); - return profile->priv->colorspace; + return priv->colorspace; } /** @@ -1256,8 +1285,9 @@ gboolean cd_profile_get_has_vcgt (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), FALSE); - return profile->priv->has_vcgt; + return priv->has_vcgt; } /** @@ -1266,8 +1296,9 @@ const gchar * cd_profile_get_checksum (CdProfile *profile) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_val_if_fail (CD_IS_PROFILE (profile), NULL); - return profile->priv->checksum; + return priv->checksum; } /** @@ -1289,8 +1320,9 @@ void cd_profile_watch_sender (CdProfile *profile, const gchar *sender) { + CdProfilePrivate *priv = GET_PRIVATE (profile); g_return_if_fail (CD_IS_PROFILE (profile)); - profile->priv->watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, + priv->watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, sender, G_BUS_NAME_WATCHER_FLAGS_NONE, NULL, @@ -1306,7 +1338,7 @@ cd_profile_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { CdProfile *profile = CD_PROFILE (object); - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); switch (prop_id) { case PROP_OBJECT_PATH: @@ -1328,7 +1360,7 @@ cd_profile_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { CdProfile *profile = CD_PROFILE (object); - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); switch (prop_id) { case PROP_OBJECT_PATH: @@ -1382,8 +1414,6 @@ G_STRUCT_OFFSET (CdProfileClass, invalidate), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - g_type_class_add_private (klass, sizeof (CdProfilePrivate)); } /** @@ -1392,9 +1422,9 @@ static void cd_profile_init (CdProfile *profile) { - profile->priv = CD_PROFILE_GET_PRIVATE (profile); - profile->priv->db = cd_profile_db_new (); - profile->priv->metadata = g_hash_table_new_full (g_str_hash, + CdProfilePrivate *priv = GET_PRIVATE (profile); + priv->db = cd_profile_db_new (); + priv->metadata = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); @@ -1407,7 +1437,7 @@ cd_profile_finalize (GObject *object) { CdProfile *profile = CD_PROFILE (object); - CdProfilePrivate *priv = profile->priv; + CdProfilePrivate *priv = GET_PRIVATE (profile); if (priv->watcher_id > 0) g_bus_unwatch_name (priv->watcher_id); diff -Nru colord-1.2.12/src/cd-profile-db.c colord-1.3.2/src/cd-profile-db.c --- colord-1.2.12/src/cd-profile-db.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-profile-db.c 2015-10-13 15:24:13.000000000 +0000 @@ -25,22 +25,21 @@ #include #include -#include "cd-cleanup.h" #include "cd-common.h" #include "cd-profile-db.h" static void cd_profile_db_finalize (GObject *object); -#define CD_PROFILE_DB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_PROFILE_DB, CdProfileDbPrivate)) +#define GET_PRIVATE(o) (cd_profile_db_get_instance_private (o)) -struct CdProfileDbPrivate +typedef struct { sqlite3 *db; -}; +} CdProfileDbPrivate; static gpointer cd_profile_db_object = NULL; -G_DEFINE_TYPE (CdProfileDb, cd_profile_db, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdProfileDb, cd_profile_db, G_TYPE_OBJECT) /** * cd_profile_db_load: @@ -50,13 +49,14 @@ const gchar *filename, GError **error) { + CdProfileDbPrivate *priv = GET_PRIVATE (pdb); const gchar *statement; gchar *error_msg = NULL; gint rc; - _cleanup_free_ gchar *path = NULL; + g_autofree gchar *path = NULL; g_return_val_if_fail (CD_IS_PROFILE_DB (pdb), FALSE); - g_return_val_if_fail (pdb->priv->db == NULL, FALSE); + g_return_val_if_fail (priv->db == NULL, FALSE); /* ensure the path exists */ path = g_path_get_dirname (filename); @@ -65,23 +65,23 @@ g_debug ("CdProfileDb: trying to open database '%s'", filename); g_info ("Using profile database file %s", filename); - rc = sqlite3_open (filename, &pdb->priv->db); + rc = sqlite3_open (filename, &priv->db); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, CD_CLIENT_ERROR_INTERNAL, "Can't open database: %s\n", - sqlite3_errmsg (pdb->priv->db)); - sqlite3_close (pdb->priv->db); + sqlite3_errmsg (priv->db)); + sqlite3_close (priv->db); return FALSE; } /* we don't need to keep doing fsync */ - sqlite3_exec (pdb->priv->db, "PRAGMA synchronous=OFF", + sqlite3_exec (priv->db, "PRAGMA synchronous=OFF", NULL, NULL, NULL); /* check schema */ - rc = sqlite3_exec (pdb->priv->db, "SELECT * FROM properties_pu LIMIT 1", + rc = sqlite3_exec (priv->db, "SELECT * FROM properties_pu LIMIT 1", NULL, NULL, &error_msg); if (rc != SQLITE_OK) { statement = "CREATE TABLE properties_pu (" @@ -90,7 +90,7 @@ "uid INTEGER," "value TEXT," "PRIMARY KEY (profile_id, property, uid));"; - sqlite3_exec (pdb->priv->db, statement, NULL, NULL, NULL); + sqlite3_exec (priv->db, statement, NULL, NULL, NULL); } return TRUE; } @@ -101,15 +101,16 @@ gboolean cd_profile_db_empty (CdProfileDb *pdb, GError **error) { + CdProfileDbPrivate *priv = GET_PRIVATE (pdb); const gchar *statement; gchar *error_msg = NULL; gint rc; g_return_val_if_fail (CD_IS_PROFILE_DB (pdb), FALSE); - g_return_val_if_fail (pdb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); statement = "DELETE FROM properties_pu;"; - rc = sqlite3_exec (pdb->priv->db, statement, + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, @@ -134,13 +135,14 @@ const gchar *value, GError **error) { + CdProfileDbPrivate *priv = GET_PRIVATE (pdb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement; gint rc; g_return_val_if_fail (CD_IS_PROFILE_DB (pdb), FALSE); - g_return_val_if_fail (pdb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); g_debug ("CdProfileDb: add profile property %s [%s=%s]", profile_id, property, value); @@ -150,7 +152,7 @@ profile_id, property, uid, value); /* insert the entry */ - rc = sqlite3_exec (pdb->priv->db, statement, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -176,13 +178,14 @@ guint uid, GError **error) { + CdProfileDbPrivate *priv = GET_PRIVATE (pdb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement = NULL; gint rc; g_return_val_if_fail (CD_IS_PROFILE_DB (pdb), FALSE); - g_return_val_if_fail (pdb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); /* remove the entry */ g_debug ("CdProfileDb: remove profile %s", profile_id); @@ -191,7 +194,7 @@ "uid = '%i' AND " "property = '%q' LIMIT 1;", profile_id, uid, property); - rc = sqlite3_exec (pdb->priv->db, statement, NULL, NULL, &error_msg); + rc = sqlite3_exec (priv->db, statement, NULL, NULL, &error_msg); if (rc != SQLITE_OK) { g_set_error (error, CD_CLIENT_ERROR, @@ -235,13 +238,14 @@ gchar **value, GError **error) { + CdProfileDbPrivate *priv = GET_PRIVATE (pdb); gboolean ret = TRUE; gchar *error_msg = NULL; gchar *statement; gint rc; g_return_val_if_fail (CD_IS_PROFILE_DB (pdb), FALSE); - g_return_val_if_fail (pdb->priv->db != NULL, FALSE); + g_return_val_if_fail (priv->db != NULL, FALSE); g_debug ("CdProfileDb: get property %s for %s", property, profile_id); statement = sqlite3_mprintf ("SELECT value FROM properties_pu WHERE " @@ -251,7 +255,7 @@ profile_id, uid, property); /* retrieve the entry */ - rc = sqlite3_exec (pdb->priv->db, + rc = sqlite3_exec (priv->db, statement, cd_profile_db_sqlite_cb, value, @@ -279,7 +283,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = cd_profile_db_finalize; - g_type_class_add_private (klass, sizeof (CdProfileDbPrivate)); } /** @@ -288,7 +291,6 @@ static void cd_profile_db_init (CdProfileDb *pdb) { - pdb->priv = CD_PROFILE_DB_GET_PRIVATE (pdb); } /** @@ -297,13 +299,11 @@ static void cd_profile_db_finalize (GObject *object) { - CdProfileDb *pdb; - g_return_if_fail (CD_IS_PROFILE_DB (object)); - pdb = CD_PROFILE_DB (object); - g_return_if_fail (pdb->priv != NULL); + CdProfileDb *pdb = CD_PROFILE_DB (object); + CdProfileDbPrivate *priv = GET_PRIVATE (pdb); /* close the database */ - sqlite3_close (pdb->priv->db); + sqlite3_close (priv->db); G_OBJECT_CLASS (cd_profile_db_parent_class)->finalize (object); } diff -Nru colord-1.2.12/src/cd-profile-db.h colord-1.3.2/src/cd-profile-db.h --- colord-1.2.12/src/cd-profile-db.h 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-profile-db.h 2015-10-13 15:24:13.000000000 +0000 @@ -26,25 +26,13 @@ G_BEGIN_DECLS -#define CD_TYPE_PROFILE_DB (cd_profile_db_get_type ()) -#define CD_PROFILE_DB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_PROFILE_DB, CdProfileDb)) -#define CD_PROFILE_DB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_PROFILE_DB, CdProfileDbClass)) -#define CD_IS_PROFILE_DB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_PROFILE_DB)) -#define CD_IS_PROFILE_DB_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_PROFILE_DB)) -#define CD_PROFILE_DB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_PROFILE_DB, CdProfileDbClass)) +#define CD_TYPE_PROFILE_DB (cd_profile_db_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdProfileDb, cd_profile_db, CD, PROFILE_DB, GObject) -typedef struct CdProfileDbPrivate CdProfileDbPrivate; - -typedef struct -{ - GObject parent; - CdProfileDbPrivate *priv; -} CdProfileDb; - -typedef struct +struct _CdProfileDbClass { GObjectClass parent_class; -} CdProfileDbClass; +}; GType cd_profile_db_get_type (void); CdProfileDb *cd_profile_db_new (void); diff -Nru colord-1.2.12/src/cd-profile.h colord-1.3.2/src/cd-profile.h --- colord-1.2.12/src/cd-profile.h 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-profile.h 2015-10-13 15:24:13.000000000 +0000 @@ -28,23 +28,10 @@ G_BEGIN_DECLS -#define CD_TYPE_PROFILE (cd_profile_get_type ()) -#define CD_PROFILE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_PROFILE, CdProfile)) -#define CD_PROFILE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_PROFILE, CdProfileClass)) -#define CD_IS_PROFILE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_PROFILE)) -#define CD_IS_PROFILE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_PROFILE)) -#define CD_PROFILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_PROFILE, CdProfileClass)) #define CD_PROFILE_ERROR cd_profile_error_quark() -typedef struct _CdProfilePrivate CdProfilePrivate; -typedef struct _CdProfile CdProfile; -typedef struct _CdProfileClass CdProfileClass; - -struct _CdProfile -{ - GObject parent; - CdProfilePrivate *priv; -}; +#define CD_TYPE_PROFILE (cd_profile_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdProfile, cd_profile, CD, PROFILE, GObject) struct _CdProfileClass { @@ -52,7 +39,6 @@ void (* invalidate) (CdProfile *profile); }; -GType cd_profile_get_type (void); CdProfile *cd_profile_new (void); GQuark cd_profile_error_quark (void); diff -Nru colord-1.2.12/src/cd-resources.c colord-1.3.2/src/cd-resources.c --- colord-1.2.12/src/cd-resources.c 2015-05-27 09:35:54.000000000 +0000 +++ colord-1.3.2/src/cd-resources.c 2016-01-05 15:23:32.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[143620]; const double alignment; void * const ptr;} cd_resource_data = { { +static const SECTION union { const guint8 data[157184]; const double alignment; void * const ptr;} cd_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x6c, 0x02, 0x00, 0x00, @@ -36,55 +36,55 @@ 0xf0, 0x1a, 0x00, 0x00, 0x11, 0x74, 0x29, 0xbd, 0x10, 0x00, 0x00, 0x00, 0xf0, 0x1a, 0x00, 0x00, 0x0e, 0x00, 0x76, 0x00, 0x00, 0x1b, 0x00, 0x00, - 0x78, 0x4f, 0x00, 0x00, 0xd9, 0x39, 0x82, 0x14, - 0x10, 0x00, 0x00, 0x00, 0x78, 0x4f, 0x00, 0x00, - 0x0f, 0x00, 0x76, 0x00, 0x88, 0x4f, 0x00, 0x00, - 0x20, 0x6f, 0x00, 0x00, 0x25, 0xee, 0x85, 0xb8, - 0x10, 0x00, 0x00, 0x00, 0x20, 0x6f, 0x00, 0x00, - 0x0c, 0x00, 0x76, 0x00, 0x30, 0x6f, 0x00, 0x00, - 0x20, 0x97, 0x00, 0x00, 0x4b, 0xf4, 0xa2, 0xf8, - 0x10, 0x00, 0x00, 0x00, 0x20, 0x97, 0x00, 0x00, - 0x16, 0x00, 0x76, 0x00, 0x38, 0x97, 0x00, 0x00, - 0x84, 0xbf, 0x00, 0x00, 0x8e, 0xab, 0xd9, 0x0e, - 0x10, 0x00, 0x00, 0x00, 0x84, 0xbf, 0x00, 0x00, - 0x0f, 0x00, 0x76, 0x00, 0x98, 0xbf, 0x00, 0x00, - 0x94, 0xf2, 0x00, 0x00, 0x09, 0x49, 0xc6, 0xea, - 0x0e, 0x00, 0x00, 0x00, 0x94, 0xf2, 0x00, 0x00, - 0x27, 0x00, 0x76, 0x00, 0xc0, 0xf2, 0x00, 0x00, - 0xcf, 0xfa, 0x00, 0x00, 0x9f, 0x1f, 0xe8, 0xc1, - 0x10, 0x00, 0x00, 0x00, 0xcf, 0xfa, 0x00, 0x00, - 0x0a, 0x00, 0x76, 0x00, 0xe0, 0xfa, 0x00, 0x00, - 0xb8, 0x28, 0x01, 0x00, 0xd8, 0xbd, 0x36, 0xd3, - 0x10, 0x00, 0x00, 0x00, 0xb8, 0x28, 0x01, 0x00, - 0x0c, 0x00, 0x76, 0x00, 0xc8, 0x28, 0x01, 0x00, - 0x00, 0x4d, 0x01, 0x00, 0xe1, 0xcf, 0x0f, 0x92, - 0x0e, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x01, 0x00, - 0x20, 0x00, 0x76, 0x00, 0x20, 0x4d, 0x01, 0x00, - 0x2f, 0x5d, 0x01, 0x00, 0x51, 0x74, 0x21, 0x88, - 0x10, 0x00, 0x00, 0x00, 0x2f, 0x5d, 0x01, 0x00, - 0x0b, 0x00, 0x76, 0x00, 0x40, 0x5d, 0x01, 0x00, - 0x58, 0x7d, 0x01, 0x00, 0x08, 0xb3, 0xaf, 0x27, - 0x13, 0x00, 0x00, 0x00, 0x58, 0x7d, 0x01, 0x00, - 0x07, 0x00, 0x4c, 0x00, 0x60, 0x7d, 0x01, 0x00, - 0x74, 0x7d, 0x01, 0x00, 0x9d, 0x36, 0xe9, 0x5c, - 0x10, 0x00, 0x00, 0x00, 0x74, 0x7d, 0x01, 0x00, - 0x0b, 0x00, 0x76, 0x00, 0x80, 0x7d, 0x01, 0x00, - 0x00, 0xa0, 0x01, 0x00, 0xfb, 0x62, 0x37, 0x42, - 0x0e, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x01, 0x00, - 0x09, 0x00, 0x4c, 0x00, 0x0c, 0xa0, 0x01, 0x00, - 0x3c, 0xa0, 0x01, 0x00, 0x06, 0xe0, 0x99, 0xd6, - 0x10, 0x00, 0x00, 0x00, 0x3c, 0xa0, 0x01, 0x00, - 0x08, 0x00, 0x76, 0x00, 0x48, 0xa0, 0x01, 0x00, - 0x0c, 0xd5, 0x01, 0x00, 0x89, 0x12, 0x0d, 0x3d, - 0x10, 0x00, 0x00, 0x00, 0x0c, 0xd5, 0x01, 0x00, - 0x10, 0x00, 0x76, 0x00, 0x20, 0xd5, 0x01, 0x00, - 0x9c, 0x04, 0x02, 0x00, 0xd6, 0xfc, 0x67, 0x05, - 0x02, 0x00, 0x00, 0x00, 0x9c, 0x04, 0x02, 0x00, - 0x0c, 0x00, 0x4c, 0x00, 0xa8, 0x04, 0x02, 0x00, - 0xac, 0x04, 0x02, 0x00, 0x5f, 0xf7, 0xc0, 0xd4, - 0x10, 0x00, 0x00, 0x00, 0xac, 0x04, 0x02, 0x00, - 0x11, 0x00, 0x76, 0x00, 0xc0, 0x04, 0x02, 0x00, - 0x04, 0x31, 0x02, 0x00, 0x6f, 0x72, 0x67, 0x2e, + 0x64, 0x54, 0x00, 0x00, 0xd9, 0x39, 0x82, 0x14, + 0x10, 0x00, 0x00, 0x00, 0x64, 0x54, 0x00, 0x00, + 0x0f, 0x00, 0x76, 0x00, 0x78, 0x54, 0x00, 0x00, + 0x78, 0x77, 0x00, 0x00, 0x25, 0xee, 0x85, 0xb8, + 0x10, 0x00, 0x00, 0x00, 0x78, 0x77, 0x00, 0x00, + 0x0c, 0x00, 0x76, 0x00, 0x88, 0x77, 0x00, 0x00, + 0xe4, 0xa5, 0x00, 0x00, 0x4b, 0xf4, 0xa2, 0xf8, + 0x10, 0x00, 0x00, 0x00, 0xe4, 0xa5, 0x00, 0x00, + 0x16, 0x00, 0x76, 0x00, 0x00, 0xa6, 0x00, 0x00, + 0xd0, 0xd2, 0x00, 0x00, 0x8e, 0xab, 0xd9, 0x0e, + 0x10, 0x00, 0x00, 0x00, 0xd0, 0xd2, 0x00, 0x00, + 0x0f, 0x00, 0x76, 0x00, 0xe0, 0xd2, 0x00, 0x00, + 0xb0, 0x09, 0x01, 0x00, 0x09, 0x49, 0xc6, 0xea, + 0x0e, 0x00, 0x00, 0x00, 0xb0, 0x09, 0x01, 0x00, + 0x27, 0x00, 0x76, 0x00, 0xd8, 0x09, 0x01, 0x00, + 0xe7, 0x11, 0x01, 0x00, 0x9f, 0x1f, 0xe8, 0xc1, + 0x10, 0x00, 0x00, 0x00, 0xe7, 0x11, 0x01, 0x00, + 0x0a, 0x00, 0x76, 0x00, 0xf8, 0x11, 0x01, 0x00, + 0xfc, 0x43, 0x01, 0x00, 0xd8, 0xbd, 0x36, 0xd3, + 0x10, 0x00, 0x00, 0x00, 0xfc, 0x43, 0x01, 0x00, + 0x0c, 0x00, 0x76, 0x00, 0x08, 0x44, 0x01, 0x00, + 0x90, 0x6b, 0x01, 0x00, 0xe1, 0xcf, 0x0f, 0x92, + 0x0e, 0x00, 0x00, 0x00, 0x90, 0x6b, 0x01, 0x00, + 0x20, 0x00, 0x76, 0x00, 0xb0, 0x6b, 0x01, 0x00, + 0xbf, 0x7b, 0x01, 0x00, 0x51, 0x74, 0x21, 0x88, + 0x10, 0x00, 0x00, 0x00, 0xbf, 0x7b, 0x01, 0x00, + 0x0b, 0x00, 0x76, 0x00, 0xd0, 0x7b, 0x01, 0x00, + 0xd4, 0xa0, 0x01, 0x00, 0x08, 0xb3, 0xaf, 0x27, + 0x13, 0x00, 0x00, 0x00, 0xd4, 0xa0, 0x01, 0x00, + 0x07, 0x00, 0x4c, 0x00, 0xdc, 0xa0, 0x01, 0x00, + 0xf0, 0xa0, 0x01, 0x00, 0x9d, 0x36, 0xe9, 0x5c, + 0x10, 0x00, 0x00, 0x00, 0xf0, 0xa0, 0x01, 0x00, + 0x0b, 0x00, 0x76, 0x00, 0x00, 0xa1, 0x01, 0x00, + 0xc8, 0xc6, 0x01, 0x00, 0xfb, 0x62, 0x37, 0x42, + 0x0e, 0x00, 0x00, 0x00, 0xc8, 0xc6, 0x01, 0x00, + 0x09, 0x00, 0x4c, 0x00, 0xd4, 0xc6, 0x01, 0x00, + 0x04, 0xc7, 0x01, 0x00, 0x06, 0xe0, 0x99, 0xd6, + 0x10, 0x00, 0x00, 0x00, 0x04, 0xc7, 0x01, 0x00, + 0x08, 0x00, 0x76, 0x00, 0x10, 0xc7, 0x01, 0x00, + 0x7c, 0x00, 0x02, 0x00, 0x89, 0x12, 0x0d, 0x3d, + 0x10, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x02, 0x00, + 0x10, 0x00, 0x76, 0x00, 0x90, 0x00, 0x02, 0x00, + 0xc4, 0x34, 0x02, 0x00, 0xd6, 0xfc, 0x67, 0x05, + 0x02, 0x00, 0x00, 0x00, 0xc4, 0x34, 0x02, 0x00, + 0x0c, 0x00, 0x4c, 0x00, 0xd0, 0x34, 0x02, 0x00, + 0xd4, 0x34, 0x02, 0x00, 0x5f, 0xf7, 0xc0, 0xd4, + 0x10, 0x00, 0x00, 0x00, 0xd4, 0x34, 0x02, 0x00, + 0x11, 0x00, 0x76, 0x00, 0xe8, 0x34, 0x02, 0x00, + 0x00, 0x66, 0x02, 0x00, 0x6f, 0x72, 0x67, 0x2e, 0x66, 0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2e, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, @@ -871,149 +871,178 @@ 0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x78, 0x31, 0x31, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, - 0x68, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x34, 0x68, 0x6c, 0x63, 0x6d, 0x73, + 0x54, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x39, 0x54, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6e, 0x6d, 0x63, 0x6c, 0x4c, 0x61, 0x62, 0x20, 0x4c, 0x61, 0x62, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x35, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x20, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0xe8, 0xe7, 0xf0, 0xa7, - 0x55, 0x0e, 0xc0, 0x46, 0x6b, 0x71, 0xe6, 0xb2, - 0xe7, 0x30, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0x39, 0xbc, 0x20, 0x76, + 0x62, 0xb5, 0xe3, 0x6b, 0x1b, 0xd2, 0xf6, 0x78, + 0x8d, 0x09, 0xaf, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x64, 0x65, 0x73, 0x63, - 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x02, 0xae, - 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x03, 0x88, - 0x00, 0x00, 0x09, 0x14, 0x42, 0x32, 0x41, 0x30, - 0x00, 0x00, 0x0c, 0x9c, 0x00, 0x00, 0x00, 0x30, - 0x77, 0x74, 0x70, 0x74, 0x00, 0x00, 0x0c, 0xcc, + 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x03, 0x4e, + 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x04, 0x28, + 0x00, 0x00, 0x0b, 0x82, 0x42, 0x32, 0x41, 0x30, + 0x00, 0x00, 0x0f, 0xac, 0x00, 0x00, 0x00, 0x30, + 0x77, 0x74, 0x70, 0x74, 0x00, 0x00, 0x0f, 0xdc, 0x00, 0x00, 0x00, 0x14, 0x6e, 0x63, 0x6c, 0x32, - 0x00, 0x00, 0x0c, 0xe0, 0x00, 0x00, 0x18, 0x0c, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x24, 0xec, - 0x00, 0x00, 0x00, 0xde, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x25, 0xcc, 0x00, 0x00, 0x0e, 0x9a, + 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x18, 0x0c, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x27, 0xfc, + 0x00, 0x00, 0x00, 0xdc, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x28, 0xd8, 0x00, 0x00, 0x10, 0x7a, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0x00, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x16, + 0x00, 0x00, 0x01, 0x3c, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x52, 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0x2a, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x01, 0x40, + 0x00, 0x00, 0x01, 0x66, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x01, 0x7c, 0x65, 0x6e, 0x47, 0x42, 0x00, 0x00, 0x00, 0x18, - 0x00, 0x00, 0x01, 0x58, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x01, 0x70, + 0x00, 0x00, 0x01, 0x94, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x01, 0xac, + 0x66, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, + 0x00, 0x00, 0x01, 0xc4, 0x67, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0xde, 0x68, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0x88, 0x69, 0x64, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x9e, + 0x00, 0x00, 0x01, 0xf2, 0x69, 0x64, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x02, 0x08, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0xb2, 0x6a, 0x61, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x01, 0xc8, - 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0xd8, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0xee, + 0x00, 0x00, 0x02, 0x1c, 0x6a, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x32, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, + 0x00, 0x00, 0x02, 0x42, 0x6e, 0x62, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x02, 0x50, + 0x6e, 0x62, 0x4e, 0x4f, 0x00, 0x00, 0x00, 0x16, + 0x00, 0x00, 0x02, 0x66, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x02, 0x7c, 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x00, 0x1a, - 0x00, 0x00, 0x02, 0x04, 0x70, 0x74, 0x50, 0x54, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x02, 0x1e, + 0x00, 0x00, 0x02, 0x92, 0x70, 0x74, 0x50, 0x54, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x02, 0xac, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x02, 0x32, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x02, 0x46, + 0x00, 0x00, 0x02, 0xc0, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x02, 0xd4, 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x02, 0x58, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x02, 0x6e, + 0x00, 0x00, 0x02, 0xe6, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x02, 0xfc, 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, - 0x00, 0x00, 0x02, 0x88, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x02, 0xa0, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x73, 0x00, 0x00, 0x00, 0x42, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x76, 0x00, 0x79, + 0x00, 0x00, 0x03, 0x16, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x03, 0x2e, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0x12, + 0x00, 0x00, 0x03, 0x3c, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, + 0x00, 0x00, 0x00, 0x42, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x76, 0x00, 0x79, 0x00, 0x20, 0x00, 0x58, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, 0x00, 0x58, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, 0x00, 0x46, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x20, 0x03, 0xa7, 0x03, 0xc1, + 0x03, 0xce, 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, + 0x03, 0xb1, 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, + 0x00, 0x75, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x75, + 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, 0x00, 0x58, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, - 0x00, 0x20, 0x00, 0x46, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, - 0x03, 0xa7, 0x03, 0xc1, 0x03, 0xce, 0x03, 0xbc, - 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, 0x00, 0x00, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x72, 0x00, 0x73, 0x00, 0x00, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, - 0x00, 0x53, 0x00, 0x7a, 0x00, 0xed, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x57, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x53, 0x00, 0x7a, 0x00, 0xed, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x00, + 0x00, 0x57, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, - 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, - 0x30, 0xab, 0x30, 0xe9, 0x30, 0xfc, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, + 0x00, 0x20, 0x30, 0xab, 0x30, 0xe9, 0x30, 0xfc, + 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, + 0x00, 0x20, 0xc0, 0xc9, 0xc0, 0xc1, 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x4b, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x58, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, + 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x58, - 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, 0x00, 0x43, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, - 0x00, 0x00, 0x04, 0x26, 0x04, 0x32, 0x04, 0x35, - 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, 0x00, 0x58, - 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, 0x00, 0x58, - 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x58, 0x04, 0x35, 0x00, 0x00, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x2d, - 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x58, - 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x00, - 0x04, 0x1a, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, - 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, - 0x82, 0x72, 0x5f, 0x69, 0x00, 0x00, 0x00, 0x00, + 0x04, 0x26, 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, + 0x04, 0x30, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, + 0x04, 0x58, 0x04, 0x35, 0x00, 0x00, 0x00, 0x58, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x2d, 0x00, 0x66, + 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x20, 0x00, 0x52, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x00, 0x04, 0x1a, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, 0x00, 0x58, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x00, 0x00, 0x58, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, 0x82, 0x72, + 0x5f, 0x69, 0x00, 0x00, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x20, 0x82, 0x72, 0x5f, 0x69, + 0x7a, 0x7a, 0x95, 0xf4, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x6a, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x52, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x01, 0xcc, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0x48, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, - 0x00, 0x00, 0x02, 0xf8, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x76, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x9a, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x02, 0x14, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x02, 0x82, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x02, 0xfe, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xae, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x03, 0xe6, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x04, 0x5a, + 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0xd2, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x05, 0xfa, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x06, 0x28, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0x5c, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x05, 0x80, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x05, 0xf4, + 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x06, 0x7a, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x07, 0x02, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x07, 0x7c, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0xee, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x08, 0x7e, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x08, 0xf8, + 0x00, 0x00, 0x08, 0x56, 0x73, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x08, 0xde, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x09, 0x52, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x09, 0xcc, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x0a, 0x3e, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x0a, 0xce, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x0b, 0x48, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -1042,59 +1071,87 @@ 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, - 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, - 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x72, 0x00, 0xe6, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, + 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, + 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, + 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, - 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0xed, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0xf1, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, @@ -1145,70 +1202,107 @@ 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, 0x30, 0x59, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x00, 0xc7, 0x91, 0xad, 0x8c, 0x00, 0x20, + 0xc8, 0x1c, 0xd5, 0x5c, 0xc7, 0x3c, 0xb8, 0x5c, + 0xbd, 0x80, 0xd1, 0x30, 0x00, 0x20, 0xc7, 0x90, + 0xc7, 0x20, 0xb8, 0x6d, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x01, 0x7e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xfd, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, @@ -1275,7 +1369,11 @@ 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, - 0x52, 0x36, 0x00, 0x00, 0x6d, 0x42, 0x41, 0x20, + 0x52, 0x36, 0x00, 0x00, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x51, 0x4d, + 0x4e, 0x8e, 0x5d, 0xf2, 0x77, 0xe5, 0x76, 0x84, + 0x72, 0x48, 0x67, 0x43, 0x96, 0x50, 0x52, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x6d, 0x42, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1295,817 +1393,821 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x67, 0x68, - 0x74, 0x20, 0x70, 0x69, 0x6e, 0x6b, 0x00, 0x0f, - 0xa7, 0x7f, 0x00, 0x00, 0xd0, 0x85, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xd0, 0x4e, 0x9c, 0xd7, + 0x74, 0x20, 0x70, 0x69, 0x6e, 0x6b, 0x00, 0x8b, + 0x79, 0x7f, 0x00, 0x00, 0x30, 0xdf, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0x4e, 0x9c, 0xd7, 0x86, 0x0b, 0xd0, 0x4e, 0x9c, 0xd7, 0x86, 0x0b, 0x50, 0x69, 0x6e, 0x6b, 0x00, 0x20, 0x70, 0x69, - 0x6e, 0x6b, 0x00, 0x0f, 0xa7, 0x7f, 0x00, 0x00, - 0xd0, 0x85, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x6e, 0x6b, 0x00, 0x8b, 0x79, 0x7f, 0x00, 0x00, + 0x30, 0xdf, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xd6, 0xa7, 0x98, 0xea, 0x84, 0x41, 0xd6, 0xa7, 0x98, 0xea, 0x84, 0x41, 0x43, 0x72, 0x69, 0x6d, - 0x73, 0x6f, 0x6e, 0x00, 0x6e, 0x6b, 0x00, 0x0f, - 0xa7, 0x7f, 0x00, 0x00, 0xd0, 0x85, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x7b, 0x7e, 0xc7, 0x47, + 0x73, 0x6f, 0x6e, 0x00, 0x6e, 0x6b, 0x00, 0x8b, + 0x79, 0x7f, 0x00, 0x00, 0x30, 0xdf, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x7b, 0x7e, 0xc7, 0x47, 0xa3, 0x2f, 0x7b, 0x7e, 0xc7, 0x47, 0xa3, 0x2f, 0x4c, 0x61, 0x76, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x20, 0x62, 0x6c, 0x75, 0x73, 0x68, 0x00, 0x00, - 0xd0, 0x85, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x30, 0xdf, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf6, 0x10, 0x86, 0x5a, 0x7f, 0xfd, 0xf6, 0x10, 0x86, 0x5a, 0x7f, 0xfd, 0x50, 0x61, 0x6c, 0x65, 0x20, 0x76, 0x69, 0x6f, 0x6c, 0x65, 0x74, 0x20, - 0x72, 0x65, 0x64, 0x00, 0xd0, 0x85, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x9c, 0x77, 0xad, 0xba, + 0x72, 0x65, 0x64, 0x00, 0x30, 0xdf, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x9c, 0x77, 0xad, 0xba, 0x81, 0xb2, 0x9c, 0x77, 0xad, 0xba, 0x81, 0xb2, 0x48, 0x6f, 0x74, 0x20, 0x70, 0x69, 0x6e, 0x6b, 0x00, 0x65, 0x74, 0x20, 0x72, 0x65, 0x64, 0x00, - 0xd0, 0x85, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x30, 0xdf, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xa9, 0x09, 0xbf, 0x9b, 0x76, 0xdf, 0xa9, 0x09, 0xbf, 0x9b, 0x76, 0xdf, 0x44, 0x65, 0x65, 0x70, 0x20, 0x70, 0x69, 0x6e, 0x6b, 0x00, 0x74, 0x20, - 0x72, 0x65, 0x64, 0x00, 0xd0, 0x85, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x91, 0x89, 0xd3, 0xa2, + 0x72, 0x65, 0x64, 0x00, 0x30, 0xdf, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x91, 0x89, 0xd3, 0xa2, 0x7c, 0x62, 0x91, 0x89, 0xd3, 0xa2, 0x7c, 0x62, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x76, 0x69, 0x6f, 0x6c, 0x65, 0x74, 0x20, 0x72, 0x65, - 0x64, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x64, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x74, 0xa8, 0xc5, 0x7d, 0x72, 0x91, 0x74, 0xa8, 0xc5, 0x7d, 0x72, 0x91, 0x4f, 0x72, 0x63, 0x68, 0x69, 0x64, 0x00, 0x76, 0x69, 0x6f, 0x6c, 0x65, - 0x74, 0x20, 0x72, 0x65, 0x64, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xa1, 0x20, 0xb4, 0xc9, + 0x74, 0x20, 0x72, 0x65, 0x64, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xa1, 0x20, 0xb4, 0xc9, 0x5e, 0x7a, 0xa1, 0x20, 0xb4, 0xc9, 0x5e, 0x7a, 0x54, 0x68, 0x69, 0x73, 0x74, 0x6c, 0x65, 0x00, 0x69, 0x6f, 0x6c, 0x65, 0x74, 0x20, 0x72, 0x65, - 0x64, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x64, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xcd, 0x28, 0x8c, 0xe6, 0x77, 0x60, 0xcd, 0x28, 0x8c, 0xe6, 0x77, 0x60, 0x50, 0x6c, 0x75, 0x6d, 0x00, 0x6c, 0x65, 0x00, 0x69, 0x6f, 0x6c, 0x65, - 0x74, 0x20, 0x72, 0x65, 0x64, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xbc, 0x07, 0x9f, 0x17, + 0x74, 0x20, 0x72, 0x65, 0x64, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xbc, 0x07, 0x9f, 0x17, 0x6a, 0xbc, 0xbc, 0x07, 0x9f, 0x17, 0x6a, 0xbc, 0x56, 0x69, 0x6f, 0x6c, 0x65, 0x74, 0x00, 0x00, 0x69, 0x6f, 0x6c, 0x65, 0x74, 0x20, 0x72, 0x65, - 0x64, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x64, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xb2, 0x95, 0xb5, 0xb0, 0x5c, 0x02, 0xb2, 0x95, 0xb5, 0xb0, 0x5c, 0x02, 0x46, 0x75, 0x63, 0x68, 0x73, 0x69, 0x61, 0x00, 0x69, 0x6f, 0x6c, 0x65, - 0x74, 0x20, 0x72, 0x65, 0x64, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x9a, 0x92, 0xdd, 0xc6, + 0x74, 0x20, 0x72, 0x65, 0x64, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x9a, 0x92, 0xdd, 0xc6, 0x44, 0x1b, 0x9a, 0x92, 0xdd, 0xc6, 0x44, 0x1b, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x6d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x61, 0x00, 0x20, 0x72, 0x65, - 0x64, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x64, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x54, 0xf7, 0xba, 0xf5, 0x5a, 0x8d, 0x54, 0xf7, 0xba, 0xf5, 0x5a, 0x8d, 0x50, 0x75, 0x72, 0x70, 0x6c, 0x65, 0x00, 0x67, 0x65, 0x6e, 0x74, 0x61, - 0x00, 0x20, 0x72, 0x65, 0x64, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x4e, 0x07, 0xb7, 0x58, + 0x00, 0x20, 0x72, 0x65, 0x64, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x4e, 0x07, 0xb7, 0x58, 0x5c, 0xdf, 0x4e, 0x07, 0xb7, 0x58, 0x5c, 0xdf, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x6f, 0x72, 0x63, 0x68, 0x69, 0x64, 0x00, 0x72, 0x65, - 0x64, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x64, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x89, 0x5e, 0xb7, 0x37, 0x51, 0x3a, 0x89, 0x5e, 0xb7, 0x37, 0x51, 0x3a, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x76, 0x69, 0x6f, 0x6c, 0x65, 0x74, 0x00, - 0x64, 0x00, 0x72, 0x65, 0x64, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x64, 0xa2, 0xc6, 0x17, + 0x64, 0x00, 0x72, 0x65, 0x64, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x64, 0xa2, 0xc6, 0x17, 0x39, 0xbf, 0x64, 0xa2, 0xc6, 0x17, 0x39, 0xbf, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x6f, 0x72, 0x63, 0x68, 0x69, 0x64, 0x00, 0x64, 0x00, 0x72, 0x65, - 0x64, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x64, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x6e, 0xbe, 0xbb, 0xd7, 0x44, 0x3f, 0x6e, 0xbe, 0xbb, 0xd7, 0x44, 0x3f, 0x49, 0x6e, 0x64, 0x69, 0x67, 0x6f, 0x00, 0x63, 0x68, 0x69, 0x64, 0x00, - 0x64, 0x00, 0x72, 0x65, 0x64, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x35, 0xd6, 0xad, 0x4e, + 0x64, 0x00, 0x72, 0x65, 0x64, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x35, 0xd6, 0xad, 0x4e, 0x4b, 0xbf, 0x35, 0xd6, 0xad, 0x4e, 0x4b, 0xbf, 0x42, 0x6c, 0x75, 0x65, 0x20, 0x76, 0x69, 0x6f, 0x6c, 0x65, 0x74, 0x00, 0x64, 0x00, 0x72, 0x65, - 0x64, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x64, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x6a, 0xb3, 0xbe, 0xd5, 0x34, 0xf7, 0x6a, 0xb3, 0xbe, 0xd5, 0x34, 0xf7, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x70, 0x75, 0x72, 0x70, 0x6c, - 0x65, 0x00, 0x72, 0x65, 0x64, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x8c, 0x1b, 0xa0, 0x03, + 0x65, 0x00, 0x72, 0x65, 0x64, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x8c, 0x1b, 0xa0, 0x03, 0x4e, 0x0e, 0x8c, 0x1b, 0xa0, 0x03, 0x4e, 0x0e, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x62, 0x6c, 0x75, - 0x65, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x84, 0x18, 0xa2, 0x17, 0x3e, 0x3e, 0x84, 0x18, 0xa2, 0x17, 0x3e, 0x3e, 0x53, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x65, - 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x73, 0x2c, 0x9d, 0xd3, + 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x73, 0x2c, 0x9d, 0xd3, 0x46, 0x1f, 0x73, 0x2c, 0x9d, 0xd3, 0x46, 0x1f, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, - 0x65, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x4f, 0x83, 0x95, 0x55, 0x56, 0x75, 0x4f, 0x83, 0x95, 0x55, 0x56, 0x75, 0x47, 0x68, 0x6f, 0x73, 0x74, 0x20, 0x77, 0x68, 0x69, 0x74, 0x65, 0x00, - 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xfa, 0x36, 0x81, 0x6f, + 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xfa, 0x36, 0x81, 0x6f, 0x7d, 0x23, 0xfa, 0x36, 0x81, 0x6f, 0x7d, 0x23, 0x4c, 0x61, 0x76, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x00, 0x74, 0x65, 0x00, 0x6c, 0x75, 0x65, 0x00, - 0x65, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xea, 0xed, 0x83, 0x45, 0x76, 0xc8, 0xea, 0xed, 0x83, 0x45, 0x76, 0xc8, 0x42, 0x6c, 0x75, 0x65, 0x00, 0x64, 0x65, 0x72, 0x00, 0x74, 0x65, 0x00, - 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x4d, 0xb8, 0xc3, 0x57, + 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x4d, 0xb8, 0xc3, 0x57, 0x11, 0x63, 0x4d, 0xb8, 0xc3, 0x57, 0x11, 0x63, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x6c, 0x75, 0x65, 0x00, - 0x65, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x3c, 0xe0, 0xb8, 0x5e, 0x22, 0xe0, 0x3c, 0xe0, 0xb8, 0x5e, 0x22, 0xe0, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, - 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x26, 0x60, 0xa8, 0x68, + 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x26, 0x60, 0xa8, 0x68, 0x3b, 0xd0, 0x26, 0x60, 0xa8, 0x68, 0x3b, 0xd0, 0x4e, 0x61, 0x76, 0x79, 0x00, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0x6c, 0x75, 0x65, 0x00, - 0x65, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x22, 0xa3, 0xa5, 0x81, 0x40, 0x45, 0x22, 0xa3, 0xa5, 0x81, 0x40, 0x45, 0x4d, 0x69, 0x64, 0x6e, 0x69, 0x67, 0x68, 0x74, 0x20, 0x62, 0x6c, 0x75, - 0x65, 0x00, 0x65, 0x00, 0x65, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x2a, 0xb3, 0x98, 0x5a, + 0x65, 0x00, 0x65, 0x00, 0x65, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x2a, 0xb3, 0x98, 0x5a, 0x4f, 0xb3, 0x2a, 0xb3, 0x98, 0x5a, 0x4f, 0xb3, 0x52, 0x6f, 0x79, 0x61, 0x6c, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x75, 0x65, 0x00, 0x65, 0x00, - 0x65, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x78, 0xc7, 0x92, 0x19, 0x3e, 0x27, 0x78, 0xc7, 0x92, 0x19, 0x3e, 0x27, 0x43, 0x6f, 0x72, 0x6e, 0x66, 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x62, - 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x9d, 0x4f, 0x83, 0x88, + 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x9d, 0x4f, 0x83, 0x88, 0x4e, 0x6d, 0x9d, 0x4f, 0x83, 0x88, 0x4e, 0x6d, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73, 0x74, 0x65, 0x65, 0x6c, 0x20, 0x62, 0x6c, 0x75, 0x65, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xc8, 0x99, 0x7d, 0x9c, 0x71, 0x14, 0xc8, 0x99, 0x7d, 0x9c, 0x71, 0x14, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x20, - 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x8f, 0x76, 0x7d, 0x16, + 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x8f, 0x76, 0x7d, 0x16, 0x75, 0x47, 0x8f, 0x76, 0x7d, 0x16, 0x75, 0x47, 0x53, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x67, 0x72, 0x61, 0x79, 0x00, 0x20, 0x67, 0x72, 0x61, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x87, 0xae, 0x7d, 0x3f, 0x75, 0xd4, 0x87, 0xae, 0x7d, 0x3f, 0x75, 0xd4, 0x44, 0x6f, 0x64, 0x67, 0x65, 0x72, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, - 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x96, 0x04, 0x81, 0x62, + 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x96, 0x04, 0x81, 0x62, 0x3f, 0xdc, 0x96, 0x04, 0x81, 0x62, 0x3f, 0xdc, 0x41, 0x6c, 0x69, 0x63, 0x65, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x00, 0x67, 0x72, 0x61, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf8, 0xa6, 0x7e, 0xb9, 0x7c, 0x2a, 0xf8, 0xa6, 0x7e, 0xb9, 0x7c, 0x2a, 0x53, 0x74, 0x65, 0x65, 0x6c, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x00, - 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x85, 0xe3, 0x78, 0x38, + 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x85, 0xe3, 0x78, 0x38, 0x5f, 0xd8, 0x85, 0xe3, 0x78, 0x38, 0x5f, 0xd8, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73, 0x6b, 0x79, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xcb, 0x36, 0x72, 0x1b, 0x63, 0x6d, 0xcb, 0x36, 0x72, 0x1b, 0x63, 0x6d, 0x53, 0x6b, 0x79, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x20, 0x62, 0x6c, - 0x75, 0x65, 0x00, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xca, 0x1c, 0x6f, 0x00, + 0x75, 0x65, 0x00, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xca, 0x1c, 0x6f, 0x00, 0x6a, 0xbc, 0xca, 0x1c, 0x6f, 0x00, 0x6a, 0xbc, 0x44, 0x65, 0x65, 0x70, 0x20, 0x73, 0x6b, 0x79, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x00, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xb8, 0x3e, 0x68, 0x84, 0x54, 0xfe, 0xb8, 0x3e, 0x68, 0x84, 0x54, 0xfe, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x75, - 0x65, 0x00, 0x00, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xd6, 0x38, 0x74, 0x4b, + 0x65, 0x00, 0x00, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd6, 0x38, 0x74, 0x4b, 0x74, 0xb9, 0xd6, 0x38, 0x74, 0x4b, 0x74, 0xb9, 0x50, 0x6f, 0x77, 0x64, 0x65, 0x72, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x65, 0x00, 0x00, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xdc, 0x2f, 0x71, 0x74, 0x78, 0x33, 0xdc, 0x2f, 0x71, 0x74, 0x78, 0x33, 0x43, 0x61, 0x64, 0x65, 0x74, 0x20, 0x62, 0x6c, 0x75, 0x65, 0x00, 0x00, - 0x65, 0x00, 0x00, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x9c, 0x98, 0x6b, 0xe4, + 0x65, 0x00, 0x00, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x9c, 0x98, 0x6b, 0xe4, 0x78, 0xc0, 0x9c, 0x98, 0x6b, 0xe4, 0x78, 0xc0, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x74, 0x75, 0x72, 0x71, 0x75, 0x6f, 0x69, 0x73, 0x65, 0x00, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xc0, 0x06, 0x56, 0x37, 0x72, 0x4b, 0xc0, 0x06, 0x56, 0x37, 0x72, 0x4b, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x00, 0x75, 0x72, 0x71, 0x75, 0x6f, 0x69, - 0x73, 0x65, 0x00, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xfd, 0x28, 0x7b, 0x6e, + 0x73, 0x65, 0x00, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xfd, 0x28, 0x7b, 0x6e, 0x7e, 0xb9, 0xfd, 0x28, 0x7b, 0x6e, 0x7e, 0xb9, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x63, 0x79, 0x61, 0x6e, 0x00, 0x69, 0x73, 0x65, 0x00, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xfa, 0x50, 0x76, 0x26, 0x7c, 0xf0, 0xfa, 0x50, 0x76, 0x26, 0x7c, 0xf0, 0x50, 0x61, 0x6c, 0x65, 0x20, 0x74, 0x75, 0x72, 0x71, 0x75, 0x6f, 0x69, - 0x73, 0x65, 0x00, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xe6, 0x2b, 0x6c, 0x05, + 0x73, 0x65, 0x00, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xe6, 0x2b, 0x6c, 0x05, 0x79, 0xbe, 0xe6, 0x2b, 0x6c, 0x05, 0x79, 0xbe, 0x41, 0x71, 0x75, 0x61, 0x00, 0x74, 0x75, 0x72, 0x71, 0x75, 0x6f, 0x69, 0x73, 0x65, 0x00, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xe8, 0x37, 0x4d, 0xe7, 0x71, 0x8d, 0xe8, 0x37, 0x4d, 0xe7, 0x71, 0x8d, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x63, 0x79, 0x61, 0x6e, 0x00, 0x6f, 0x69, - 0x73, 0x65, 0x00, 0x79, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x85, 0xbb, 0x60, 0x9e, + 0x73, 0x65, 0x00, 0x79, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x85, 0xbb, 0x60, 0x9e, 0x77, 0x0e, 0x85, 0xbb, 0x60, 0x9e, 0x77, 0x0e, 0x54, 0x65, 0x61, 0x6c, 0x00, 0x63, 0x79, 0x61, 0x6e, 0x00, 0x6f, 0x69, 0x73, 0x65, 0x00, 0x79, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x7b, 0xc6, 0x62, 0x8b, 0x77, 0x9e, 0x7b, 0xc6, 0x62, 0x8b, 0x77, 0x9e, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x67, - 0x72, 0x61, 0x79, 0x00, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x51, 0xa3, 0x74, 0xaa, + 0x72, 0x61, 0x79, 0x00, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x51, 0xa3, 0x74, 0xaa, 0x7c, 0xad, 0x51, 0xa3, 0x74, 0xaa, 0x7c, 0xad, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x74, 0x75, 0x72, 0x71, 0x75, 0x6f, 0x69, 0x73, 0x65, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xc4, 0x46, 0x59, 0xbd, 0x77, 0x8c, 0xc4, 0x46, 0x59, 0xbd, 0x77, 0x8c, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73, 0x65, 0x61, 0x20, 0x67, 0x72, - 0x65, 0x65, 0x6e, 0x00, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xa8, 0x1d, 0x59, 0xe4, + 0x65, 0x65, 0x6e, 0x00, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xa8, 0x1d, 0x59, 0xe4, 0x79, 0x9d, 0xa8, 0x1d, 0x59, 0xe4, 0x79, 0x9d, 0x54, 0x75, 0x72, 0x71, 0x75, 0x6f, 0x69, 0x73, 0x65, 0x00, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, - 0x00, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xcf, 0x7c, 0x53, 0x7a, 0x7b, 0xd5, 0xcf, 0x7c, 0x53, 0x7a, 0x7b, 0xd5, 0x41, 0x71, 0x75, 0x61, 0x6d, 0x61, 0x72, 0x69, 0x6e, 0x65, 0x00, 0x72, - 0x65, 0x65, 0x6e, 0x00, 0x00, 0x00, 0x39, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xeb, 0x43, 0x53, 0xb2, + 0x65, 0x65, 0x6e, 0x00, 0x00, 0x00, 0xb7, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xeb, 0x43, 0x53, 0xb2, 0x89, 0xa8, 0xeb, 0x43, 0x53, 0xb2, 0x89, 0xa8, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x61, 0x71, 0x75, 0x61, 0x6d, 0x61, 0x72, 0x69, 0x6e, - 0x65, 0x00, 0x39, 0x10, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x00, 0xb7, 0x62, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xc1, 0xb0, 0x5a, 0xdd, 0x88, 0x52, 0xc1, 0xb0, 0x5a, 0xdd, 0x88, 0x52, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x73, 0x70, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xdf, 0x76, 0x3c, 0xf8, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xdf, 0x76, 0x3c, 0xf8, 0xa0, 0x0e, 0xdf, 0x76, 0x3c, 0xf8, 0xa0, 0x0e, 0x4d, 0x69, 0x6e, 0x74, 0x20, 0x63, 0x72, 0x65, 0x61, 0x6d, 0x00, 0x6e, 0x67, 0x20, 0x67, 0x72, - 0x65, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xfd, 0xd2, 0x7c, 0x6f, 0x81, 0xb2, 0xfd, 0xd2, 0x7c, 0x6f, 0x81, 0xb2, 0x53, 0x70, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xe2, 0x88, 0x38, 0x23, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xe2, 0x88, 0x38, 0x23, 0xae, 0x61, 0xe2, 0x88, 0x38, 0x23, 0xae, 0x61, 0x4d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x73, 0x65, 0x61, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, - 0x65, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xa7, 0x6c, 0x52, 0xcd, 0x98, 0x12, 0xa7, 0x6c, 0x52, 0xcd, 0x98, 0x12, 0x53, 0x65, 0x61, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x84, 0xa2, 0x5b, 0x18, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x84, 0xa2, 0x5b, 0x18, 0x93, 0xd6, 0x84, 0xa2, 0x5b, 0x18, 0x93, 0xd6, 0x48, 0x6f, 0x6e, 0x65, 0x79, 0x64, 0x65, 0x77, 0x00, 0x00, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, - 0x65, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xfc, 0x5c, 0x79, 0x6c, 0x85, 0xec, 0xfc, 0x5c, 0x79, 0x6c, 0x85, 0xec, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x73, 0x65, 0x61, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x00, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xb8, 0xf5, 0x6a, 0x60, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xb8, 0xf5, 0x6a, 0x60, 0x92, 0x3d, 0xb8, 0xf5, 0x6a, 0x60, 0x92, 0x3d, 0x50, 0x61, 0x6c, 0x65, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x65, 0x65, 0x6e, 0x00, 0x00, - 0x65, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xe8, 0x8c, 0x53, 0xb5, 0xa6, 0x63, 0xe8, 0x8c, 0x53, 0xb5, 0xa6, 0x63, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x65, 0x6e, 0x00, 0x00, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xdd, 0xd2, 0x55, 0x8e, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xdd, 0xd2, 0x55, 0x8e, 0xa4, 0xd2, 0xdd, 0xd2, 0x55, 0x8e, 0xa4, 0xd2, 0x4c, 0x69, 0x6d, 0x65, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x00, 0x65, 0x6e, 0x00, 0x00, - 0x65, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xba, 0x64, 0x42, 0xe9, 0xbc, 0x0d, 0xba, 0x64, 0x42, 0xe9, 0xbc, 0x0d, 0x4c, 0x69, 0x6d, 0x65, 0x00, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x00, 0x65, 0x6e, 0x00, 0x00, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xe0, 0xf2, 0x31, 0x64, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xe0, 0xf2, 0x31, 0x64, 0xd1, 0x09, 0xe0, 0xf2, 0x31, 0x64, 0xd1, 0x09, 0x46, 0x6f, 0x72, 0x65, 0x73, 0x74, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x6e, 0x00, 0x00, - 0x65, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x82, 0x7b, 0x53, 0x68, 0xab, 0x8a, 0x82, 0x7b, 0x53, 0x68, 0xab, 0x8a, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x6e, 0x00, 0x00, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x77, 0x79, 0x51, 0xca, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x77, 0x79, 0x51, 0xca, 0xaf, 0x6f, 0x77, 0x79, 0x51, 0xca, 0xaf, 0x6f, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x00, - 0x65, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x5e, 0x4f, 0x59, 0xd7, 0xa6, 0xee, 0x5e, 0x4f, 0x59, 0xd7, 0xa6, 0xee, 0x4c, 0x61, 0x77, 0x6e, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x00, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xe4, 0x18, 0x43, 0x46, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xe4, 0x18, 0x43, 0x46, 0xd3, 0x12, 0xe4, 0x18, 0x43, 0x46, 0xd3, 0x12, 0x43, 0x68, 0x61, 0x72, 0x74, 0x72, 0x65, 0x75, 0x73, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x00, - 0x65, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x65, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xe6, 0xa0, 0x43, 0x1a, 0xd3, 0xe8, 0xe6, 0xa0, 0x43, 0x1a, 0xd3, 0xe8, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, 0x6e, 0x00, 0x00, 0x65, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xec, 0x21, 0x52, 0x21, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xec, 0x21, 0x52, 0x21, 0xd0, 0x9a, 0xec, 0x21, 0x52, 0x21, 0xd0, 0x9a, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x6f, 0x6c, 0x69, 0x76, 0x65, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, - 0x00, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x6d, 0x9e, 0x70, 0x66, 0x9d, 0xf7, 0x6d, 0x9e, 0x70, 0x66, 0x9d, 0xf7, 0x59, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x65, 0x65, 0x6e, 0x00, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xc4, 0xc9, 0x5f, 0x7e, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xc4, 0xc9, 0x5f, 0x7e, 0xc1, 0xa0, 0xc4, 0xc9, 0x5f, 0x7e, 0xc1, 0xa0, 0x4f, 0x6c, 0x69, 0x76, 0x65, 0x20, 0x64, 0x72, 0x61, 0x62, 0x00, 0x6e, 0x00, 0x65, 0x65, 0x6e, - 0x00, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x8d, 0x14, 0x68, 0x2d, 0xb0, 0x8c, 0x8d, 0x14, 0x68, 0x2d, 0xb0, 0x8c, 0x49, 0x76, 0x6f, 0x72, 0x79, 0x00, 0x64, 0x72, 0x61, 0x62, 0x00, 0x6e, 0x00, 0x65, 0x65, 0x6e, 0x00, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xff, 0x3a, 0x7e, 0x9a, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xff, 0x3a, 0x7e, 0x9a, 0x87, 0xb3, 0xff, 0x3a, 0x7e, 0x9a, 0x87, 0xb3, 0x42, 0x65, 0x69, 0x67, 0x65, 0x00, 0x64, 0x72, 0x61, 0x62, 0x00, 0x6e, 0x00, 0x65, 0x65, 0x6e, - 0x00, 0x65, 0x6e, 0x00, 0xa7, 0x7f, 0x00, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0x00, 0x65, 0x6e, 0x00, 0x95, 0x55, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf5, 0xe9, 0x7d, 0x63, 0x8c, 0x99, 0xf5, 0xe9, 0x7d, 0x63, 0x8c, 0x99, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, 0x65, 0x65, 0x6e, 0x00, 0x65, 0x6e, 0x00, - 0xa7, 0x7f, 0x00, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xfe, 0x76, 0x7c, 0xb5, + 0x95, 0x55, 0x00, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xfe, 0x76, 0x7c, 0xb5, 0x8f, 0x63, 0xfe, 0x76, 0x7c, 0xb5, 0x8f, 0x63, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x67, 0x6f, 0x6c, 0x64, 0x65, 0x6e, 0x20, 0x72, 0x6f, 0x64, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf9, 0xa6, 0x7b, 0xb1, 0x93, 0xc9, 0xf9, 0xa6, 0x7b, 0xb1, 0x93, 0xc9, 0x59, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, 0x6f, 0x6c, 0x64, 0x65, 0x6e, 0x20, 0x72, 0x6f, 0x64, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xf9, 0xe7, 0x70, 0xc0, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xf9, 0xe7, 0x70, 0xc0, 0xdd, 0x7e, 0xf9, 0xe7, 0x70, 0xc0, 0xdd, 0x7e, 0x4f, 0x6c, 0x69, 0x76, 0x65, 0x00, 0x00, 0x6f, 0x6c, 0x64, 0x65, 0x6e, 0x20, 0x72, 0x6f, 0x64, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x86, 0x4c, 0x77, 0x25, 0xb6, 0xf6, 0x86, 0x4c, 0x77, 0x25, 0xb6, 0xf6, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x6b, 0x68, 0x61, 0x6b, 0x69, 0x00, 0x6e, 0x20, 0x72, 0x6f, 0x64, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xbc, 0xd9, 0x7a, 0xb3, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xbc, 0xd9, 0x7a, 0xb3, 0xa7, 0x92, 0xbc, 0xd9, 0x7a, 0xb3, 0xa7, 0x92, 0x50, 0x61, 0x6c, 0x65, 0x20, 0x67, 0x6f, 0x6c, 0x64, 0x65, 0x6e, 0x20, 0x72, 0x6f, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xea, 0x02, 0x7b, 0xb1, 0x9f, 0x80, 0xea, 0x02, 0x7b, 0xb1, 0x9f, 0x80, 0x4c, 0x65, 0x6d, 0x6f, 0x6e, 0x20, 0x63, 0x68, 0x69, 0x66, 0x66, 0x6f, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xfa, 0x71, 0x7c, 0xfa, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xfa, 0x71, 0x7c, 0xfa, 0x96, 0xd1, 0xfa, 0x71, 0x7c, 0xfa, 0x96, 0xd1, 0x4b, 0x68, 0x61, 0x6b, 0x69, 0x00, 0x63, 0x68, 0x69, 0x66, 0x66, 0x6f, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xe8, 0x23, 0x7a, 0xe9, 0xad, 0x6a, 0xe8, 0x23, 0x7a, 0xe9, 0xad, 0x6a, 0x47, 0x6f, 0x6c, 0x64, 0x00, 0x00, 0x63, 0x68, 0x69, 0x66, 0x66, 0x6f, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xe0, 0x0c, 0x83, 0x67, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xe0, 0x0c, 0x83, 0x67, 0xd6, 0x77, 0xe0, 0x0c, 0x83, 0x67, 0xd6, 0x77, 0x43, 0x6f, 0x72, 0x6e, 0x20, 0x73, 0x69, 0x6c, 0x6b, 0x00, 0x66, 0x6f, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf9, 0xd4, 0x7f, 0x8c, 0x8e, 0xe3, 0xf9, 0xd4, 0x7f, 0x8c, 0x8e, 0xe3, 0x47, 0x6f, 0x6c, 0x64, 0x65, 0x6e, 0x20, 0x72, 0x6f, 0x64, 0x00, 0x6f, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xb6, 0xef, 0x8c, 0xad, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xb6, 0xef, 0x8c, 0xad, 0xc4, 0x65, 0xb6, 0xef, 0x8c, 0xad, 0xc4, 0x65, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x67, 0x6f, 0x6c, 0x64, 0x65, 0x6e, 0x20, 0x72, 0x6f, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x99, 0x5e, 0x8d, 0x80, 0xbd, 0xe1, 0x99, 0x5e, 0x8d, 0x80, 0xbd, 0xe1, 0x46, 0x6c, 0x6f, 0x72, 0x61, 0x6c, 0x20, 0x77, 0x68, 0x69, 0x74, 0x65, 0x00, 0x6f, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xfc, 0x0e, 0x80, 0xf6, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xfc, 0x0e, 0x80, 0xf6, 0x85, 0xee, 0xfc, 0x0e, 0x80, 0xf6, 0x85, 0xee, 0x4f, 0x6c, 0x64, 0x20, 0x6c, 0x61, 0x63, 0x65, 0x00, 0x69, 0x74, 0x65, 0x00, 0x6f, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf8, 0x02, 0x81, 0x6a, 0x88, 0xc1, 0xf8, 0x02, 0x81, 0x6a, 0x88, 0xc1, 0x57, 0x68, 0x65, 0x61, 0x74, 0x00, 0x63, 0x65, 0x00, 0x69, 0x74, 0x65, 0x00, 0x6f, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xe5, 0x73, 0x83, 0xf9, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xe5, 0x73, 0x83, 0xf9, 0x98, 0xaf, 0xe5, 0x73, 0x83, 0xf9, 0x98, 0xaf, 0x4f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x65, 0x00, 0x69, 0x74, 0x65, 0x00, 0x6f, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xc1, 0xca, 0x9b, 0xf8, 0xce, 0xb7, 0xc1, 0xca, 0x9b, 0xf8, 0xce, 0xb7, 0x4d, 0x6f, 0x63, 0x63, 0x61, 0x73, 0x69, 0x6e, 0x00, 0x69, 0x74, 0x65, 0x00, 0x6f, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xeb, 0x8b, 0x85, 0x0f, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xeb, 0x8b, 0x85, 0x0f, 0x9b, 0x10, 0xeb, 0x8b, 0x85, 0x0f, 0x9b, 0x10, 0x50, 0x61, 0x70, 0x61, 0x79, 0x61, 0x20, 0x77, 0x68, 0x69, 0x70, 0x00, 0x00, 0x6f, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf3, 0xd6, 0x83, 0x0a, 0x8f, 0x2b, 0xf3, 0xd6, 0x83, 0x0a, 0x8f, 0x2b, 0x42, 0x6c, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x64, 0x20, 0x61, 0x6c, 0x6d, 0x6f, 0x6e, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xf0, 0xf2, 0x84, 0x18, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xf0, 0xf2, 0x84, 0x18, 0x91, 0xb2, 0xf0, 0xf2, 0x84, 0x18, 0x91, 0xb2, 0x4e, 0x61, 0x76, 0x61, 0x6a, 0x6f, 0x20, 0x77, 0x68, 0x69, 0x74, 0x65, 0x00, 0x6e, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xe7, 0x79, 0x87, 0x3a, 0x9d, 0x00, 0xe7, 0x79, 0x87, 0x3a, 0x9d, 0x00, 0x41, 0x6e, 0x74, 0x69, 0x71, 0x75, 0x65, 0x20, 0x77, 0x68, 0x69, 0x74, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xf0, 0x54, 0x83, 0x5c, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xf0, 0x54, 0x83, 0x5c, 0x8c, 0x28, 0xf0, 0x54, 0x83, 0x5c, 0x8c, 0x28, 0x54, 0x61, 0x6e, 0x00, 0x71, 0x75, 0x65, 0x20, 0x77, 0x68, 0x69, 0x74, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xc0, 0xde, 0x87, 0x6b, 0x99, 0x16, 0xc0, 0xde, 0x87, 0x6b, 0x99, 0x16, 0x42, 0x75, 0x72, 0x6c, 0x79, 0x20, 0x77, 0x6f, 0x6f, 0x64, 0x00, 0x74, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xc6, 0x38, 0x89, 0xc4, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xc6, 0x38, 0x89, 0xc4, 0x9e, 0xb5, 0xc6, 0x38, 0x89, 0xc4, 0x9e, 0xb5, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x6f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xb4, 0x18, 0xa8, 0x32, 0xcb, 0x76, 0xb4, 0x18, 0xa8, 0x32, 0xcb, 0x76, 0x42, 0x69, 0x73, 0x71, 0x75, 0x65, 0x00, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xec, 0x28, 0x86, 0x86, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xec, 0x28, 0x86, 0x86, 0x93, 0xba, 0xec, 0x28, 0x86, 0x86, 0x93, 0xba, 0x4c, 0x69, 0x6e, 0x65, 0x6e, 0x00, 0x00, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf4, 0x38, 0x82, 0xbd, 0x86, 0x9d, 0xf4, 0x38, 0x82, 0xbd, 0x86, 0x9d, 0x50, 0x65, 0x72, 0x75, 0x00, 0x00, 0x00, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x9f, 0xdf, 0x98, 0x58, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x9f, 0xdf, 0x98, 0x58, 0xb0, 0x51, 0x9f, 0xdf, 0x98, 0x58, 0xb0, 0x51, 0x50, 0x65, 0x61, 0x63, 0x68, 0x20, 0x70, 0x75, 0x66, 0x66, 0x00, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xe5, 0x7a, 0x8a, 0x47, 0x95, 0xce, 0xe5, 0x7a, 0x8a, 0x47, 0x95, 0xce, 0x53, 0x61, 0x6e, 0x64, 0x79, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xbe, 0xf3, 0x9a, 0x2e, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xbe, 0xf3, 0x9a, 0x2e, 0xaf, 0x98, 0xbe, 0xf3, 0x9a, 0x2e, 0xaf, 0x98, 0x43, 0x68, 0x6f, 0x63, 0x6f, 0x6c, 0x61, 0x74, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x91, 0x9c, 0xa7, 0x88, 0xb8, 0xcf, 0x91, 0x9c, 0xa7, 0x88, 0xb8, 0xcf, 0x53, 0x61, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x62, 0x82, 0x9c, 0x1e, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x62, 0x82, 0x9c, 0x1e, 0xa7, 0xec, 0x62, 0x82, 0x9c, 0x1e, 0xa7, 0xec, 0x53, 0x65, 0x61, 0x73, 0x68, 0x65, 0x6c, 0x6c, 0x00, 0x6f, 0x77, 0x6e, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xf8, 0xcd, 0x83, 0x17, 0x85, 0x23, 0xf8, 0xcd, 0x83, 0x17, 0x85, 0x23, 0x53, 0x69, 0x65, 0x6e, 0x6e, 0x61, 0x00, 0x6c, 0x00, 0x6f, 0x77, 0x6e, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x72, 0x6e, 0x9f, 0x12, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x72, 0x6e, 0x9f, 0x12, 0xa3, 0xcf, 0x72, 0x6e, 0x9f, 0x12, 0xa3, 0xcf, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73, 0x61, 0x6c, 0x6d, 0x6f, 0x6e, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xc0, 0xd8, 0xa1, 0xf3, 0xa3, 0xad, 0xc0, 0xd8, 0xa1, 0xf3, 0xa3, 0xad, 0x43, 0x6f, 0x72, 0x61, 0x6c, 0x00, 0x73, 0x61, 0x6c, 0x6d, 0x6f, 0x6e, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xae, 0x70, 0xaf, 0xc6, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xae, 0x70, 0xaf, 0xc6, 0xb0, 0xab, 0xae, 0x70, 0xaf, 0xc6, 0xb0, 0xab, 0x4f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x72, 0x65, 0x64, 0x00, 0x6e, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x96, 0x66, 0xc5, 0x68, 0xc5, 0x70, 0x96, 0x66, 0xc5, 0x68, 0xc5, 0x70, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x73, 0x61, 0x6c, 0x6d, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xb4, 0x53, 0x9e, 0x51, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xb4, 0x53, 0x9e, 0x51, 0x9c, 0xc0, 0xb4, 0x53, 0x9e, 0x51, 0x9c, 0xc0, 0x54, 0x6f, 0x6d, 0x61, 0x74, 0x6f, 0x00, 0x6c, 0x6d, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xa1, 0xbd, 0xbb, 0xae, 0xaf, 0xd0, 0xa1, 0xbd, 0xbb, 0xae, 0xaf, 0xd0, 0x53, 0x61, 0x6c, 0x6d, 0x6f, 0x6e, 0x00, 0x6c, 0x6d, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xae, 0x14, 0xaf, 0x03, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xae, 0x14, 0xaf, 0x03, 0x9e, 0x77, 0xae, 0x14, 0xaf, 0x03, 0x9e, 0x77, 0x4d, 0x69, 0x73, 0x74, 0x79, 0x20, 0x52, 0x6f, 0x73, 0x65, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xed, 0x8a, 0x89, 0xb2, 0x85, 0x85, 0xed, 0x8a, 0x89, 0xb2, 0x85, 0x85, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x63, 0x6f, 0x72, 0x61, 0x6c, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xab, 0x08, 0xac, 0x36, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xab, 0x08, 0xac, 0x36, 0x94, 0xe4, 0xab, 0x08, 0xac, 0x36, 0x94, 0xe4, 0x53, 0x6e, 0x6f, 0x77, 0x00, 0x20, 0x63, 0x6f, 0x72, 0x61, 0x6c, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xfc, 0x91, 0x82, 0x37, 0x81, 0x1f, 0xfc, 0x91, 0x82, 0x37, 0x81, 0x1f, 0x52, 0x6f, 0x73, 0x79, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xa3, 0xc9, 0x91, 0xfd, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xa3, 0xc9, 0x91, 0xfd, 0x87, 0x6b, 0xa3, 0xc9, 0x91, 0xfd, 0x87, 0x6b, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x8a, 0xc7, 0xad, 0xfd, 0x97, 0x5e, 0x8a, 0xc7, 0xad, 0xfd, 0x97, 0x5e, 0x52, 0x65, 0x64, 0x00, 0x61, 0x6e, 0x20, 0x52, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x8b, 0xac, 0xd0, 0xef, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x8b, 0xac, 0xd0, 0xef, 0xc3, 0xdd, 0x8b, 0xac, 0xd0, 0xef, 0xc3, 0xdd, 0x42, 0x72, 0x6f, 0x77, 0x6e, 0x00, 0x20, 0x52, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x63, 0x0b, 0xb2, 0x2f, 0x9f, 0x17, 0x63, 0x0b, 0xb2, 0x2f, 0x9f, 0x17, 0x46, 0x69, 0x72, 0x65, 0x62, 0x72, 0x69, 0x63, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x67, 0x3e, 0xb8, 0x66, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x67, 0x3e, 0xb8, 0x66, 0xa6, 0x09, 0x67, 0x3e, 0xb8, 0x66, 0xa6, 0x09, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x72, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x4b, 0xc0, 0xb2, 0xad, 0xa7, 0x7b, 0x4b, 0xc0, 0xb2, 0xad, 0xa7, 0x7b, 0x4d, 0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x45, 0x60, 0xaf, 0x86, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x45, 0x60, 0xaf, 0x86, 0xa4, 0x4d, 0x45, 0x60, 0xaf, 0x86, 0xa4, 0x4d, 0x57, 0x68, 0x69, 0x74, 0x65, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0x57, 0x68, 0x69, 0x74, 0x65, 0x20, 0x73, 0x6d, 0x6f, 0x6b, 0x65, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xf7, 0x2a, 0x80, 0x80, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xf7, 0x2a, 0x80, 0x80, 0x80, 0x80, 0xf7, 0x2a, 0x80, 0x80, 0x80, 0x80, 0x47, 0x61, 0x69, 0x6e, 0x73, 0x62, 0x6f, 0x72, 0x6f, 0x00, 0x65, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xe0, 0xca, 0x80, 0x80, 0x80, 0x80, 0xe0, 0xca, 0x80, 0x80, 0x80, 0x80, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20, 0x67, 0x72, 0x65, 0x79, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xd8, 0xa0, 0x80, 0x80, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xd8, 0xa0, 0x80, 0x80, 0x80, 0x80, 0xd8, 0xa0, 0x80, 0x80, 0x80, 0x80, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x00, 0x72, 0x65, 0x79, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0xc7, 0x2a, 0x80, 0x80, 0x80, 0x80, 0xc7, 0x2a, 0x80, 0x80, 0x80, 0x80, 0x44, 0x61, 0x72, 0x6b, 0x20, 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0xb1, 0xa3, 0x80, 0x80, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0xb1, 0xa3, 0x80, 0x80, 0x80, 0x80, 0xb1, 0xa3, 0x80, 0x80, 0x80, 0x80, 0x47, 0x72, 0x61, 0x79, 0x00, 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x89, 0xee, 0x80, 0x80, 0x80, 0x80, 0x89, 0xee, 0x80, 0x80, 0x80, 0x80, 0x44, 0x69, 0x6d, 0x20, 0x67, 0x72, 0x61, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x00, 0x00, 0xdc, 0x3a, 0x10, - 0xa7, 0x7f, 0x00, 0x00, 0x72, 0xca, 0x80, 0x83, + 0x6c, 0x6f, 0x77, 0x00, 0xd0, 0xd1, 0xb6, 0x62, + 0x95, 0x55, 0x00, 0x00, 0x72, 0xca, 0x80, 0x83, 0x80, 0x80, 0x72, 0xca, 0x80, 0x83, 0x80, 0x80, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x00, 0x61, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x20, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, - 0x00, 0xdc, 0x3a, 0x10, 0xa7, 0x7f, 0x00, 0x00, + 0xd0, 0xd1, 0xb6, 0x62, 0x95, 0x55, 0x00, 0x00, 0x08, 0x0a, 0x80, 0x8d, 0x80, 0x7d, 0x08, 0x0a, 0x80, 0x8d, 0x80, 0x7d, 0x64, 0x69, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x66, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x94, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xa2, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xa8, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xbc, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x86, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x92, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xa6, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xba, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, - 0x00, 0x43, 0x00, 0x30, 0x00, 0x43, 0x00, 0x4d, - 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, 0x00, 0x63, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, - 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0xc4, - 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, - 0x00, 0x00, 0x01, 0xb0, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x02, 0x9e, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x4c, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, + 0x00, 0x30, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, + 0x00, 0x5f, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x64, 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x2d, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0xec, + 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xee, 0x00, 0x00, 0x01, 0xd4, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, + 0x00, 0x00, 0x02, 0xc2, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x03, 0xb6, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x03, 0xae, 0x65, 0x6e, 0x47, 0x42, - 0x00, 0x00, 0x00, 0xf2, 0x00, 0x00, 0x04, 0xac, + 0x00, 0x00, 0x04, 0xc6, 0x65, 0x6e, 0x47, 0x42, + 0x00, 0x00, 0x00, 0xf2, 0x00, 0x00, 0x05, 0xc4, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, - 0x00, 0x00, 0x05, 0x9e, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x06, 0xae, - 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, - 0x00, 0x00, 0x07, 0x7e, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0xf2, 0x00, 0x00, 0x08, 0x72, - 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, - 0x00, 0x00, 0x09, 0x64, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xe6, 0x00, 0x00, 0x0a, 0x50, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, - 0x00, 0x00, 0x0b, 0x36, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x0c, 0x26, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2e, - 0x00, 0x00, 0x0d, 0x20, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x0e, 0x4e, + 0x00, 0x00, 0x06, 0xb6, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x07, 0xc6, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, + 0x00, 0x00, 0x08, 0x96, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x09, 0x12, + 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x00, 0xf2, + 0x00, 0x00, 0x0a, 0x06, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x0a, 0xf8, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, + 0x00, 0x00, 0x0b, 0xe4, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x0c, 0xca, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfa, + 0x00, 0x00, 0x0d, 0xba, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x2e, 0x00, 0x00, 0x0e, 0xb4, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x4c, + 0x00, 0x00, 0x0f, 0xe2, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x10, 0x2e, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x63, @@ -2165,162 +2267,208 @@ 0x00, 0x62, 0x00, 0x79, 0x00, 0x6c, 0x00, 0x79, 0x00, 0x20, 0x00, 0x76, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x46, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x62, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x68, - 0x00, 0xe4, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x46, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, - 0x00, 0x31, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x41, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x68, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x51, 0x00, 0x75, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x66, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x66, 0x00, 0x20, + 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x68, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x76, 0x00, 0xe6, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x2e, - 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, - 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, - 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, - 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xc9, 0x03, 0xbc, - 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, - 0x03, 0xb9, 0x03, 0xad, 0x03, 0xc7, 0x03, 0xb5, - 0x03, 0xb9, 0x00, 0x20, 0x03, 0xcc, 0x03, 0xbb, - 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xce, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xc5, - 0x00, 0x20, 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xaf, - 0x03, 0xb6, 0x03, 0xbf, 0x03, 0xbd, 0x03, 0xc4, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x00, 0x58, - 0x00, 0x31, 0x00, 0x31, 0x00, 0x2c, 0x00, 0x20, - 0x03, 0xc5, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb8, - 0x03, 0xad, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xbd, - 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xcc, 0x03, 0xc4, 0x03, 0xb9, 0x00, 0x20, + 0x00, 0x42, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x46, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x68, 0x00, 0xe4, 0x00, 0x6c, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x46, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x75, + 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x73, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x41, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x68, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x51, 0x00, 0x75, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x66, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x2e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xad, + 0x03, 0xc7, 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xcc, 0x03, 0xbb, 0x03, 0xb1, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, + 0x03, 0xc1, 0x03, 0xce, 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb7, 0x03, 0xb3, 0x03, 0xb1, 0x03, 0xaf, - 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, - 0x03, 0xce, 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, - 0x03, 0xb1, 0x00, 0x20, 0x03, 0xad, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xb5, 0x03, 0xc0, 0x03, 0xb5, - 0x00, 0x20, 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, - 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, - 0x03, 0xb9, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, - 0x00, 0x31, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x75, 0x00, 0x6d, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x75, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, + 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x20, 0x03, 0xbf, + 0x03, 0xc1, 0x03, 0xaf, 0x03, 0xb6, 0x03, 0xbf, + 0x03, 0xbd, 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x75, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x75, 0x00, 0x70, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x2c, 0x00, 0x20, 0x03, 0xc5, 0x03, 0xc0, + 0x03, 0xbf, 0x03, 0xb8, 0x03, 0xad, 0x03, 0xc4, + 0x03, 0xbf, 0x03, 0xbd, 0x03, 0xc4, 0x03, 0xb1, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xcc, 0x03, 0xc4, + 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb1, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb7, 0x03, 0xb3, + 0x03, 0xb1, 0x03, 0xaf, 0x03, 0xb1, 0x00, 0x20, + 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xce, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, 0x00, 0x20, + 0x03, 0xad, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xb5, + 0x03, 0xc0, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xbd, + 0x03, 0xb1, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x00, 0x00, 0x51, 0x00, 0x75, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x27, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x75, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x67, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x75, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x58, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x75, 0x00, 0x6d, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x75, 0x00, 0x70, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x00, 0x51, + 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x27, 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x68, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x2e, 0x00, 0x00, 0xc7, 0x74, + 0x00, 0x20, 0xc7, 0x74, 0xb9, 0x84, 0xc7, 0x74, + 0x00, 0x20, 0xbd, 0x99, 0xc7, 0x40, 0x00, 0x20, + 0xc0, 0xc9, 0xc0, 0xc1, 0x00, 0x20, 0xd5, 0x04, + 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, 0xc5, 0xd0, + 0xb2, 0x94, 0x00, 0x20, 0x00, 0x58, 0x00, 0x31, + 0x00, 0x31, 0xc5, 0xd0, 0xc1, 0x1c, 0x00, 0x20, + 0xc6, 0xd0, 0xbc, 0xf8, 0x00, 0x20, 0xc0, 0xc9, + 0xc0, 0xc1, 0xc7, 0x44, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0xb8, 0x5c, + 0x00, 0x20, 0xac, 0x00, 0xc8, 0x15, 0xd5, 0x58, + 0xc5, 0xec, 0x00, 0x20, 0xc8, 0x15, 0xc7, 0x58, + 0xd5, 0x5c, 0x00, 0x20, 0xba, 0xa8, 0xb4, 0xe0, + 0x00, 0x20, 0xc0, 0xc9, 0xc0, 0xc1, 0xc7, 0x74, + 0x00, 0x20, 0xb4, 0xe4, 0xc5, 0xb4, 0xc7, 0x88, + 0xc2, 0xb5, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, @@ -2548,47 +2696,57 @@ 0xff, 0x0c, 0x5c, 0x07, 0x4f, 0x86, 0x6e, 0x90, 0x82, 0x72, 0x50, 0x47, 0x5b, 0x9a, 0x70, 0xba, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x53, 0x4d, 0x50, 0x54, 0x45, 0x2d, 0x43, 0x2d, - 0x52, 0x47, 0x42, 0x2e, 0x69, 0x63, 0x63, 0x00, - 0x88, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x1f, 0x88, 0x6c, 0x63, 0x6d, 0x73, + 0x00, 0x42, 0x30, 0x02, 0x00, 0x00, 0x8b, 0xe5, + 0x82, 0x72, 0x5f, 0x69, 0x7a, 0x7a, 0x95, 0xf4, + 0x53, 0x05, 0x54, 0x2b, 0x4e, 0x86, 0x00, 0x20, + 0x00, 0x58, 0x00, 0x31, 0x00, 0x31, 0x00, 0x20, + 0x5b, 0x9a, 0x4e, 0x49, 0x76, 0x84, 0x62, 0x40, + 0x67, 0x09, 0x98, 0x9c, 0x82, 0x72, 0xff, 0x0c, + 0x5b, 0x83, 0x50, 0x47, 0x5b, 0x9a, 0x67, 0x65, + 0x6e, 0x90, 0x98, 0x9c, 0x82, 0x72, 0x7a, 0x7a, + 0x95, 0xf4, 0x66, 0x2f, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x30, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x53, 0x4d, 0x50, 0x54, + 0x45, 0x2d, 0x43, 0x2d, 0x52, 0x47, 0x42, 0x2e, + 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf0, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x22, 0xf0, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x34, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1f, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0xff, 0x9b, 0xf3, 0x21, - 0xc2, 0xe6, 0x71, 0x8a, 0xdb, 0x88, 0x46, 0x63, - 0xba, 0x73, 0xc2, 0xbb, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0xba, 0x0a, 0x39, 0x5f, + 0xce, 0x9e, 0x6a, 0xb4, 0x8d, 0xd3, 0xf8, 0x2f, + 0xe8, 0xf9, 0x32, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x34, 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x54, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0a, 0x68, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0a, 0x7c, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0c, 0xd8, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0xec, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xa8, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0a, 0xbc, + 0x00, 0x00, 0x0d, 0x18, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0d, 0x2c, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xd0, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe4, + 0x00, 0x00, 0x0d, 0x40, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x54, 0x00, 0x00, 0x00, 0x10, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0a, 0xe4, 0x00, 0x00, 0x00, 0x10, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe4, + 0x00, 0x00, 0x0d, 0x54, 0x00, 0x00, 0x00, 0x10, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x54, 0x00, 0x00, 0x00, 0x10, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0a, 0xf4, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0b, 0x18, - 0x00, 0x00, 0x01, 0x96, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x0c, 0xb0, 0x00, 0x00, 0x12, 0xd6, + 0x00, 0x00, 0x0d, 0x64, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0d, 0x88, + 0x00, 0x00, 0x01, 0x94, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x0f, 0x1c, 0x00, 0x00, 0x13, 0xd4, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x18, @@ -2596,35 +2754,44 @@ 0x00, 0x50, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0xe8, + 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x01, 0x52, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x01, 0xcc, - 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, - 0x00, 0x00, 0x02, 0x48, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x02, 0xf8, + 0x00, 0x00, 0x01, 0x9a, 0x64, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x02, 0x14, + 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, + 0x00, 0x00, 0x02, 0x82, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0xfe, + 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, + 0x00, 0x00, 0x03, 0xae, 0x67, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, - 0x00, 0x00, 0x03, 0x76, 0x69, 0x64, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x03, 0xe6, + 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, - 0x00, 0x00, 0x04, 0x5a, 0x6a, 0x61, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x04, 0xd2, - 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, - 0x00, 0x00, 0x05, 0x00, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x05, 0x80, + 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x05, 0xfa, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, + 0x00, 0x00, 0x06, 0x28, 0x6e, 0x62, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0x5c, + 0x6e, 0x62, 0x4e, 0x4f, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x00, 0x86, - 0x00, 0x00, 0x05, 0xf4, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x06, 0x7a, - 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x07, 0x02, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x07, 0x7c, - 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, - 0x00, 0x00, 0x07, 0xee, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x08, 0x7e, - 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, - 0x00, 0x00, 0x08, 0xf8, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x08, 0x56, + 0x73, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, + 0x00, 0x00, 0x08, 0xde, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x09, 0x52, + 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x09, 0xcc, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x0a, 0x3e, + 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x0a, 0xce, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0b, 0x48, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0x1e, + 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, @@ -2653,79 +2820,107 @@ 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x79, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, 0x00, 0x7a, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x6b, - 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, - 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, - 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, 0x03, 0xbb, - 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, 0x03, 0xad, - 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xc3, - 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, - 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb9, - 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbd, - 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb1, - 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xce, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, 0x03, 0xc9, - 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, - 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, - 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x73, 0x00, 0x7a, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x7a, 0x01, 0x51, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x67, 0x00, 0x6b, 0x00, 0xf6, - 0x00, 0x74, 0x00, 0xe9, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x74, 0x01, 0x51, 0x00, 0x6c, - 0x00, 0x00, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, + 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x62, 0x00, 0x65, 0x00, 0x67, + 0x00, 0x72, 0x00, 0xe6, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x68, 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, + 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, + 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, + 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xb1, 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, + 0x03, 0xb3, 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, + 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, + 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, + 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, + 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, + 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, + 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xb1, 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, + 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, + 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x66, 0x00, 0xed, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x69, 0x00, 0xf3, 0x00, 0x6e, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0xf1, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x73, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x7a, 0x01, 0x51, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x6b, 0x00, 0xf6, + 0x00, 0x74, 0x00, 0xe9, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x6b, 0x00, 0x74, 0x01, 0x51, 0x00, 0x6c, + 0x00, 0x00, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x62, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x62, 0x00, 0x61, 0x00, 0x74, 0x00, 0x61, 0x00, 0x73, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x68, 0x00, 0x61, @@ -2755,71 +2950,108 @@ 0x65, 0xe2, 0x77, 0xe5, 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, - 0x30, 0x59, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, - 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, - 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x30, 0x59, 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, + 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, + 0xc7, 0x40, 0x00, 0x20, 0xc8, 0x00, 0xc7, 0x91, + 0xad, 0x8c, 0x00, 0x20, 0xc8, 0x1c, 0xd5, 0x5c, + 0xc7, 0x3c, 0xb8, 0x5c, 0xbd, 0x80, 0xd1, 0x30, + 0x00, 0x20, 0xc7, 0x90, 0xc7, 0x20, 0xb8, 0x6d, + 0xc2, 0xb5, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, + 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, - 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x04, 0x1e, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x68, 0x00, 0x75, 0x00, 0x6a, 0x00, 0x65, + 0x00, 0x20, 0x01, 0x7e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x58, @@ -2886,6 +3118,10 @@ 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, 0x52, 0x36, 0x00, 0x00, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x51, 0x4d, 0x4e, 0x8e, 0x5d, 0xf2, + 0x77, 0xe5, 0x76, 0x84, 0x72, 0x48, 0x67, 0x43, + 0x96, 0x50, 0x52, 0x36, 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, @@ -2911,697 +3147,728 @@ 0x64, 0x69, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x28, - 0x00, 0x00, 0x00, 0xca, 0x00, 0x00, 0x00, 0x08, - 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x00, 0xe8, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00, 0x22, - 0x00, 0x00, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x1c, - 0x00, 0x00, 0x01, 0x46, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0x5c, 0x00, 0x00, 0x00, 0x0e, - 0x00, 0x00, 0x01, 0x6a, 0x00, 0x00, 0x00, 0x06, - 0x00, 0x00, 0x01, 0x70, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0x86, 0x00, 0x00, 0x00, 0x10, + 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0a, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x28, + 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x08, + 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x16, + 0x00, 0x00, 0x00, 0xe6, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0xf2, 0x00, 0x00, 0x00, 0x14, + 0x00, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x22, + 0x00, 0x00, 0x01, 0x28, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x01, 0x44, 0x00, 0x00, 0x00, 0x16, + 0x00, 0x00, 0x01, 0x5a, 0x00, 0x00, 0x00, 0x0e, + 0x00, 0x00, 0x01, 0x68, 0x00, 0x00, 0x00, 0x06, + 0x00, 0x00, 0x01, 0x6e, 0x00, 0x00, 0x00, 0x16, + 0x00, 0x00, 0x01, 0x84, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x31, - 0x00, 0x2e, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, - 0x00, 0x31, 0x00, 0x47, 0x00, 0x41, 0x00, 0x4d, - 0x00, 0x55, 0x00, 0x54, 0x00, 0x5f, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00, 0x28, - 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, - 0x00, 0x29, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x38, - 0x00, 0x30, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, - 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, 0x00, 0x74, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, 0x00, 0x4d, - 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, 0x00, 0x63, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, 0x00, 0x41, - 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, 0x00, 0x52, - 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x6d, 0x00, 0x70, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x2d, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, - 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, - 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x00, - 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0c, - 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x01, 0x1e, - 0x00, 0x00, 0x00, 0xc4, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x42, 0x00, 0x00, 0x01, 0xe2, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x01, 0x68, - 0x00, 0x00, 0x03, 0x24, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xae, 0x00, 0x00, 0x04, 0x8c, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0x40, - 0x00, 0x00, 0x06, 0x3a, 0x66, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x5e, 0x00, 0x00, 0x07, 0x7a, - 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x01, 0x36, - 0x00, 0x00, 0x08, 0xd8, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x36, 0x00, 0x00, 0x0a, 0x0e, + 0x00, 0x2e, 0x00, 0x33, 0x00, 0x2e, 0x00, 0x32, + 0x00, 0x47, 0x00, 0x41, 0x00, 0x4d, 0x00, 0x55, + 0x00, 0x54, 0x00, 0x5f, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x28, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, 0x00, 0x29, + 0x00, 0x30, 0x00, 0x2e, 0x00, 0x38, 0x00, 0x30, + 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x75, 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, + 0x00, 0x5f, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x64, 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x2d, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x53, 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, + 0x00, 0x44, 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, + 0x00, 0x5f, 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x6d, + 0x00, 0x70, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, + 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x64, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, + 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, + 0x00, 0x00, 0x01, 0x1e, 0x00, 0x00, 0x00, 0xdc, + 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0x42, + 0x00, 0x00, 0x01, 0xfa, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x68, 0x00, 0x00, 0x03, 0x3c, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x01, 0xae, + 0x00, 0x00, 0x04, 0xa4, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x06, 0x52, + 0x66, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x5e, + 0x00, 0x00, 0x07, 0x92, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x36, 0x00, 0x00, 0x08, 0xf0, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, + 0x00, 0x00, 0x0a, 0x26, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x36, 0x00, 0x00, 0x0a, 0xbe, 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x01, 0x46, - 0x00, 0x00, 0x0b, 0x44, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x52, 0x00, 0x00, 0x0c, 0x8a, + 0x00, 0x00, 0x0b, 0xf4, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x52, 0x00, 0x00, 0x0d, 0x3a, 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x4c, - 0x00, 0x00, 0x0d, 0xdc, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x3e, 0x00, 0x00, 0x0f, 0x28, + 0x00, 0x00, 0x0e, 0x8c, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x3e, 0x00, 0x00, 0x0f, 0xd8, 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb2, - 0x00, 0x00, 0x10, 0x66, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x70, 0x00, 0x00, 0x11, 0x18, + 0x00, 0x00, 0x11, 0x16, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x70, 0x00, 0x00, 0x11, 0xc8, 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x4e, - 0x00, 0x00, 0x12, 0x88, 0x00, 0x54, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x75, - 0x00, 0x72, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x4e, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x74, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x75, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x59, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x79, + 0x00, 0x00, 0x13, 0x38, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x13, 0x86, + 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x75, 0x00, 0x72, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x54, 0x00, 0x6f, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, - 0x01, 0x0d, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6e, - 0x00, 0xfd, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x75, 0x01, 0x7e, 0x00, 0xed, - 0x00, 0x76, 0x00, 0x61, 0x00, 0x6e, 0x00, 0xfd, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x76, - 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x68, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x6b, 0x00, 0x79, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x20, 0x00, 0x53, 0x00, 0x65, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, 0x00, 0xed, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x4a, - 0x00, 0x61, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x6d, 0x01, 0x1b, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x62, 0x00, 0xfd, 0x00, 0x74, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x4e, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x74, 0x00, 0x68, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x4a, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x67, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x59, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x68, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x6c, 0x00, 0x79, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x75, 0x01, 0x0d, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x6e, 0x00, 0xfd, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x75, - 0x01, 0x7e, 0x00, 0xed, 0x00, 0x76, 0x00, 0xe1, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x20, + 0x01, 0x7e, 0x00, 0xed, 0x00, 0x76, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0xfd, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x75, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x6f, 0x00, 0x76, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x68, 0x00, 0x72, + 0x00, 0xe1, 0x00, 0x76, 0x00, 0x6b, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x20, 0x00, 0x53, + 0x00, 0x65, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x6e, 0x00, 0xed, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x75, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x6d, + 0x01, 0x1b, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0xfd, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x75, 0x01, 0x7e, 0x00, 0xed, + 0x00, 0x76, 0x00, 0xe1, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6b, 0x00, 0xf3, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x76, 0x00, 0xe1, + 0x00, 0x6e, 0x00, 0xed, 0x00, 0x20, 0x01, 0x0d, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6b, 0x00, 0xf3, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x76, 0x00, 0xe1, 0x00, 0x6e, 0x00, 0xed, - 0x00, 0x20, 0x01, 0x0d, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6b, 0x00, 0xf3, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x76, 0x00, 0xe1, - 0x00, 0x6e, 0x00, 0xed, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x61, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6b, 0x00, 0x74, 0x00, 0x75, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x53, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0xfc, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x53, 0x00, 0x74, - 0x00, 0x75, 0x00, 0x64, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x61, 0x00, 0x75, 0x00, 0x66, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x68, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x4e, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x77, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x46, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x75, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x44, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x56, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x77, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x77, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x2e, 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, - 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc4, 0x03, 0xc1, 0x03, 0xad, 0x03, 0xc7, - 0x03, 0xbf, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xcc, 0x03, 0xc4, 0x03, 0xc5, - 0x03, 0xc0, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x20, 0x03, 0xc7, - 0x03, 0xc1, 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb9, - 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, - 0x03, 0xb9, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xc4, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xb7, 0x00, 0x20, 0x03, 0x92, 0x03, 0xcc, - 0x03, 0xc1, 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0x91, 0x03, 0xbc, 0x03, 0xb5, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xae, - 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, - 0x00, 0x20, 0x03, 0x99, 0x03, 0xb1, 0x03, 0xc0, - 0x03, 0xc9, 0x03, 0xbd, 0x03, 0xaf, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xb3, 0x03, 0xb9, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xb3, 0x03, 0xb3, - 0x03, 0xc1, 0x03, 0xb1, 0x03, 0xc6, 0x03, 0xae, - 0x00, 0x20, 0x03, 0xc3, 0x03, 0xb5, 0x00, 0x20, - 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, - 0x03, 0xbd, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xbf, - 0x00, 0x2e, 0x00, 0x20, 0x03, 0x98, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xad, - 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, - 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, - 0x03, 0xc1, 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb9, - 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, - 0x03, 0xb9, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xc4, - 0x03, 0xb5, 0x00, 0x20, 0x03, 0xbc, 0x03, 0xcc, - 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, - 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, - 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xb9, - 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xba, 0x03, 0xc9, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xbf, - 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xaf, 0x03, 0xb7, - 0x03, 0xc3, 0x03, 0xb7, 0x00, 0x20, 0x03, 0xae, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xbf, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x61, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x74, + 0x00, 0x75, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x53, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xfc, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x53, 0x00, 0x74, 0x00, 0x75, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x6f, 0x00, 0x61, 0x00, 0x75, + 0x00, 0x66, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x68, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4e, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x4a, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x77, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x72, 0x00, 0x64, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x44, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x46, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x62, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x75, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x4b, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x56, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x77, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x2e, 0x00, 0x00, + 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, + 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, + 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xc1, + 0x03, 0xad, 0x03, 0xc7, 0x03, 0xbf, 0x03, 0xbd, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xcc, + 0x03, 0xc4, 0x03, 0xc5, 0x03, 0xc0, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xc5, + 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xb7, + 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbc, 0x03, 0xbf, + 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb9, 0x03, 0xb5, + 0x03, 0xaf, 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, + 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, 0x00, 0x20, + 0x03, 0x92, 0x03, 0xcc, 0x03, 0xc1, 0x03, 0xb5, + 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, 0x03, 0x91, + 0x03, 0xbc, 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, + 0x03, 0xba, 0x03, 0xae, 0x00, 0x20, 0x03, 0xba, + 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, 0x03, 0x99, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xc9, 0x03, 0xbd, + 0x03, 0xaf, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xb3, + 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb5, + 0x03, 0xb3, 0x03, 0xb3, 0x03, 0xc1, 0x03, 0xb1, + 0x03, 0xc6, 0x03, 0xae, 0x00, 0x20, 0x03, 0xc3, + 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc3, 0x03, 0xc4, + 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xbd, 0x03, 0xc4, + 0x03, 0xb9, 0x03, 0xbf, 0x00, 0x2e, 0x00, 0x20, + 0x03, 0x98, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xad, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xb9, 0x00, 0x20, 0x03, 0xbd, 0x03, 0xb1, + 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xb7, + 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbc, 0x03, 0xbf, + 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb9, 0x03, 0xb5, + 0x03, 0xaf, 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, + 0x03, 0xbc, 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc5, 0x03, 0xc4, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, + 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, + 0x03, 0xb3, 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xba, 0x03, 0xc9, 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xaf, 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb7, - 0x00, 0x20, 0x03, 0xb2, 0x03, 0xaf, 0x03, 0xbd, - 0x03, 0xc4, 0x03, 0xb5, 0x03, 0xbf, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x20, 0x03, 0xae, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb1, + 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xba, 0x03, 0xc9, + 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xbf, + 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xaf, 0x03, 0xb7, + 0x03, 0xc3, 0x03, 0xb7, 0x00, 0x20, 0x03, 0xb2, + 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xc4, 0x03, 0xb5, + 0x03, 0xbf, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0xe1, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x74, 0x00, 0x75, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4e, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x6d, 0x00, 0xe9, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x79, 0x00, 0x20, 0x00, 0x4a, + 0x00, 0x61, 0x00, 0x70, 0x00, 0xf3, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x62, 0x00, 0x61, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x75, 0x00, 0x64, 0x00, 0x69, 0x00, 0x6f, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x72, 0x00, 0xed, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x63, 0x00, 0x74, - 0x00, 0x75, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x4e, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x6d, 0x00, 0xe9, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, - 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x62, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x72, 0x00, 0xed, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x00, 0x00, 0x43, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x74, 0x00, 0x75, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x73, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x41, 0x00, 0x6d, - 0x00, 0xe9, 0x00, 0x72, 0x00, 0x69, 0x00, 0x71, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, - 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x75, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x20, 0x19, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x67, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x56, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x65, 0x00, 0x7a, - 0x00, 0x20, 0x00, 0x6c, 0x20, 0x19, 0x00, 0x75, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x64, 0x00, 0xe9, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0xe9, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x51, 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0xe8, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x75, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x67, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x75, 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x67, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x4e, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x47, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x55, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x71, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x79, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x4a, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x00, 0x00, 0x43, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x63, 0x00, 0x6e, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x63, 0x00, 0x74, 0x00, 0x75, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x73, 0x00, 0xe9, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x6d, 0x00, 0xe9, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x75, 0x00, 0x20, 0x00, 0x4a, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x20, 0x19, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x72, 0x00, 0x65, 0x00, 0x67, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x56, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x76, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x6c, + 0x20, 0x19, 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x64, 0x00, 0xe9, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x64, 0x00, 0xe9, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x51, 0x00, 0x75, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0xe8, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x75, - 0x01, 0x7c, 0x00, 0x79, 0x00, 0x77, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x50, 0x00, 0xf3, 0x01, 0x42, - 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x6a, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x01, 0x44, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x75, 0x00, 0x64, 0x00, 0x79, - 0x00, 0x6a, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x6f, 0x00, 0x77, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x79, 0x01, 0x07, 0x00, 0x20, 0x00, 0x75, - 0x01, 0x7c, 0x00, 0x79, 0x00, 0x77, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x79, 0x00, 0x6c, 0x00, 0x6b, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x75, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x67, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x67, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x47, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x55, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, + 0x00, 0x00, 0xc7, 0x74, 0xb2, 0x94, 0x00, 0x20, + 0xbd, 0x81, 0xc5, 0x44, 0xba, 0x54, 0xb9, 0xac, + 0xce, 0x74, 0x00, 0x2c, 0x00, 0x20, 0xc7, 0x7c, + 0xbc, 0xf8, 0xc5, 0xd0, 0xc1, 0x1c, 0x00, 0x20, + 0xc2, 0xa4, 0xd2, 0x9c, 0xb5, 0x14, 0xc6, 0x24, + 0x00, 0x20, 0xb1, 0x79, 0xd6, 0x54, 0xc2, 0xdc, + 0x00, 0x20, 0xd6, 0x5c, 0xc6, 0xa9, 0xd5, 0x58, + 0xb2, 0x94, 0x00, 0x20, 0xd4, 0x5c, 0xc9, 0x00, + 0xc5, 0x48, 0xc7, 0x85, 0xb2, 0xc8, 0xb2, 0xe4, + 0x00, 0x2e, 0x00, 0x20, 0xb3, 0xd9, 0xc6, 0x01, + 0xc0, 0xc1, 0xc7, 0x44, 0x00, 0x20, 0xc7, 0x78, + 0xcf, 0x54, 0xb5, 0x29, 0xd5, 0x58, 0xac, 0x70, + 0xb0, 0x98, 0x00, 0x20, 0xb5, 0x14, 0xcf, 0x54, + 0xb5, 0x29, 0xd5, 0x60, 0x00, 0x20, 0xac, 0xbd, + 0xc6, 0xb0, 0xc5, 0xd0, 0xb9, 0xcc, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x44, 0x00, 0x20, + 0xd6, 0x5c, 0xc6, 0xa9, 0xd5, 0x74, 0xc5, 0x7c, + 0xd5, 0x69, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x4a, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x75, 0x01, 0x7c, 0x00, 0x79, + 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x20, 0x00, 0x50, + 0x00, 0xf3, 0x01, 0x42, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6a, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x4a, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x01, 0x44, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, + 0x00, 0x64, 0x00, 0x79, 0x00, 0x6a, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x50, 0x00, 0x6f, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, 0x01, 0x07, + 0x00, 0x20, 0x00, 0x75, 0x01, 0x7c, 0x00, 0x79, + 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x79, 0x00, 0x6c, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x01, 0x44, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x72, 0x00, 0xe3, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x75, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x6d, 0x00, 0xe9, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x4e, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x4a, - 0x00, 0x61, 0x00, 0x70, 0x00, 0xe3, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x76, 0x00, 0x61, 0x00, 0xe7, - 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0xfa, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x54, 0x00, 0x56, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x56, 0x00, 0x6f, - 0x00, 0x63, 0x00, 0xea, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x01, 0x44, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x72, 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x75, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x6d, 0x00, 0xe9, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, + 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x76, + 0x00, 0x61, 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xfa, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x54, 0x00, 0x56, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x56, 0x00, 0x6f, 0x00, 0x63, 0x00, 0xea, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x76, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x76, 0x00, 0xed, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3a, - 0x04, 0x43, 0x04, 0x49, 0x04, 0x38, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x34, 0x04, 0x30, 0x04, 0x40, - 0x04, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x37, 0x04, 0x43, 0x04, 0x35, - 0x04, 0x3c, 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, - 0x04, 0x32, 0x00, 0x20, 0x04, 0x21, 0x04, 0x35, - 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, 0x04, 0x3d, - 0x04, 0x3e, 0x04, 0x39, 0x00, 0x20, 0x04, 0x10, - 0x04, 0x3c, 0x04, 0x35, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x3a, 0x04, 0x35, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x2f, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3d, 0x04, 0x38, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x32, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x43, 0x04, 0x34, 0x04, 0x38, 0x04, 0x39, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x39, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x30, 0x04, 0x3f, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x38, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x12, 0x04, 0x30, 0x04, 0x3c, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x34, - 0x04, 0x43, 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x3a, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x38, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x38, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x38, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x38, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3e, - 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3a, - 0x04, 0x43, 0x04, 0x5b, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x34, 0x04, 0x30, 0x04, 0x40, 0x04, 0x34, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x58, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x41, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, 0x04, 0x21, - 0x04, 0x35, 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x58, 0x00, 0x20, - 0x04, 0x10, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x46, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x08, 0x04, 0x30, - 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, + 0x00, 0xed, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3a, 0x04, 0x43, 0x04, 0x49, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x34, + 0x04, 0x30, 0x04, 0x40, 0x04, 0x42, 0x00, 0x2c, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, + 0x04, 0x43, 0x04, 0x35, 0x04, 0x3c, 0x04, 0x4b, + 0x04, 0x39, 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, + 0x04, 0x21, 0x04, 0x35, 0x04, 0x32, 0x04, 0x35, + 0x04, 0x40, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x10, 0x04, 0x3c, 0x04, 0x35, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x2f, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, 0x04, 0x34, - 0x04, 0x38, 0x04, 0x58, 0x04, 0x41, 0x04, 0x3a, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x3c, 0x04, 0x30, 0x04, 0x5a, - 0x04, 0x30, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x22, - 0x04, 0x40, 0x04, 0x35, 0x04, 0x31, 0x04, 0x30, - 0x04, 0x3b, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, - 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x30, 0x04, 0x3c, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x38, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x5a, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x34, 0x04, 0x38, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x5a, 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x3d, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x30, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x20, 0x00, 0xe4, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x75, 0x00, 0x76, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, 0x00, 0x4e, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x4a, - 0x00, 0x61, 0x00, 0x70, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x62, 0x00, 0xf6, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, 0x00, 0x6b, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x42, - 0x00, 0x75, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0xfc, 0x00, 0x64, 0x00, 0x79, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x79, 0x00, 0x64, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x4b, 0x00, 0x75, 0x00, 0x7a, - 0x00, 0x65, 0x00, 0x79, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x01, 0x31, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x76, 0x00, 0x63, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x74, 0x00, 0x74, - 0x01, 0x31, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, - 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x47, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x34, 0x04, 0x30, 0x04, 0x40, - 0x04, 0x42, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x49, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3a, + 0x04, 0x38, 0x04, 0x39, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x39, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, + 0x04, 0x3f, 0x04, 0x38, 0x04, 0x41, 0x04, 0x38, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x12, 0x04, 0x30, + 0x04, 0x3c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x43, 0x04, 0x35, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x37, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, + 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x3e, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x1e, 0x04, 0x32, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3a, 0x04, 0x43, 0x04, 0x5b, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x34, 0x04, 0x30, + 0x04, 0x40, 0x04, 0x34, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x58, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x43, - 0x04, 0x54, 0x04, 0x42, 0x04, 0x4c, 0x04, 0x41, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x1f, 0x04, 0x56, 0x04, 0x32, 0x04, 0x3d, - 0x04, 0x56, 0x04, 0x47, 0x04, 0x3d, 0x04, 0x56, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x10, 0x04, 0x3c, + 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x43, + 0x00, 0x20, 0x04, 0x21, 0x04, 0x35, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x40, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x58, 0x00, 0x20, 0x04, 0x10, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x40, 0x04, 0x38, 0x04, 0x46, - 0x04, 0x56, 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x2f, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3d, 0x04, 0x56, 0x04, 0x57, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, 0x04, 0x34, - 0x04, 0x56, 0x04, 0x39, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x45, 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, - 0x04, 0x3b, 0x04, 0x35, 0x04, 0x37, 0x04, 0x30, - 0x04, 0x3f, 0x04, 0x38, 0x04, 0x41, 0x04, 0x56, - 0x04, 0x32, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x26, - 0x04, 0x38, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, - 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3c, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x3b, 0x04, 0x56, 0x04, 0x34, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3b, - 0x04, 0x38, 0x04, 0x48, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x34, 0x04, 0x43, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x43, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x56, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3e, 0x00, 0x2e, 0x00, 0x00, - 0x90, 0x19, 0x66, 0x2f, 0x53, 0x17, 0x7f, 0x8e, - 0x82, 0x07, 0x65, 0xe5, 0x67, 0x2c, 0x4f, 0x7f, - 0x75, 0x28, 0x76, 0x84, 0x5d, 0xe5, 0x4f, 0x5c, - 0x5b, 0xa4, 0x93, 0x04, 0x88, 0xfd, 0x6a, 0x19, - 0x6e, 0x96, 0x30, 0x02, 0x60, 0xa8, 0x61, 0xc9, - 0x53, 0xea, 0x4f, 0x7f, 0x75, 0x28, 0x6b, 0x64, - 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x65, 0xbc, - 0x89, 0x96, 0x8a, 0x0a, 0x7d, 0xe8, 0x78, 0xbc, - 0x30, 0x01, 0x89, 0xe3, 0x78, 0xbc, 0x75, 0x28, - 0x90, 0x14, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x41, 0x70, 0x70, 0x6c, 0x65, 0x52, 0x47, 0x42, - 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x27, 0xe0, 0x6c, 0x63, 0x6d, 0x73, - 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, - 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x2f, 0x61, 0x63, 0x73, 0x70, - 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x08, 0x04, 0x30, 0x04, 0x3f, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x43, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x43, 0x04, 0x34, 0x04, 0x38, 0x04, 0x58, + 0x04, 0x41, 0x04, 0x3a, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x3c, + 0x04, 0x30, 0x04, 0x5a, 0x04, 0x30, 0x00, 0x2e, + 0x00, 0x20, 0x04, 0x22, 0x04, 0x40, 0x04, 0x35, + 0x04, 0x31, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x38, 0x04, 0x42, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x30, 0x04, 0x3c, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x38, 0x04, 0x40, 0x04, 0x30, 0x04, 0x5a, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, 0x04, 0x35, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x34, 0x04, 0x38, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x5a, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x3c, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x30, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x61, 0x00, 0x20, + 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x75, 0x00, 0x76, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, + 0x00, 0x20, 0x00, 0x4e, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x66, + 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x75, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x6f, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x44, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x62, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x42, 0x00, 0x75, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0xfc, + 0x00, 0x64, 0x00, 0x79, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x79, 0x00, 0x64, + 0x01, 0x31, 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, + 0x00, 0x75, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x4a, 0x00, 0x61, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x66, 0x01, 0x31, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x76, 0x00, 0x63, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x74, 0x00, 0x74, 0x01, 0x31, 0x00, 0x72, + 0x00, 0x2e, 0x00, 0x00, 0x04, 0x26, 0x04, 0x35, + 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x47, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x34, + 0x04, 0x30, 0x04, 0x40, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, + 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x49, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x43, 0x04, 0x54, 0x04, 0x42, + 0x04, 0x4c, 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x1f, 0x04, 0x56, + 0x04, 0x32, 0x04, 0x3d, 0x04, 0x56, 0x04, 0x47, + 0x04, 0x3d, 0x04, 0x56, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x10, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x46, 0x04, 0x56, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, 0x04, 0x2f, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x56, + 0x04, 0x57, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x43, 0x04, 0x34, 0x04, 0x56, 0x04, 0x39, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x35, 0x04, 0x3b, 0x04, 0x35, + 0x04, 0x37, 0x04, 0x30, 0x04, 0x3f, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x56, 0x04, 0x32, 0x00, 0x2e, + 0x00, 0x20, 0x04, 0x26, 0x04, 0x38, 0x04, 0x3c, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x35, + 0x04, 0x3c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, + 0x04, 0x56, 0x04, 0x34, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x38, 0x04, 0x41, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x48, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x34, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x56, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3e, + 0x00, 0x2e, 0x00, 0x00, 0x90, 0x19, 0x66, 0x2f, + 0x53, 0x17, 0x7f, 0x8e, 0x82, 0x07, 0x65, 0xe5, + 0x67, 0x2c, 0x4f, 0x7f, 0x75, 0x28, 0x76, 0x84, + 0x5d, 0xe5, 0x4f, 0x5c, 0x5b, 0xa4, 0x93, 0x04, + 0x88, 0xfd, 0x6a, 0x19, 0x6e, 0x96, 0x30, 0x02, + 0x60, 0xa8, 0x61, 0xc9, 0x53, 0xea, 0x4f, 0x7f, + 0x75, 0x28, 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, + 0x6a, 0x94, 0x65, 0xbc, 0x89, 0x96, 0x8a, 0x0a, + 0x7d, 0xe8, 0x78, 0xbc, 0x30, 0x01, 0x89, 0xe3, + 0x78, 0xbc, 0x75, 0x28, 0x90, 0x14, 0x30, 0x02, + 0x00, 0x00, 0x8f, 0xd9, 0x66, 0x2f, 0x76, 0xee, + 0x52, 0x4d, 0x53, 0x17, 0x7f, 0x8e, 0x54, 0x8c, + 0x65, 0xe5, 0x67, 0x2c, 0x5d, 0xe5, 0x4f, 0x5c, + 0x5b, 0xa4, 0x89, 0xc6, 0x98, 0x91, 0x5f, 0x55, + 0x52, 0x36, 0x65, 0xf6, 0x65, 0xf6, 0x75, 0x28, + 0x76, 0x84, 0x68, 0x07, 0x51, 0xc6, 0x30, 0x02, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x4e, 0xc5, 0x75, 0x28, 0x4e, 0x8e, + 0x89, 0xc6, 0x98, 0x91, 0x76, 0x84, 0x7f, 0x16, + 0x89, 0xe3, 0x78, 0x01, 0x30, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x41, 0x70, 0x70, 0x6c, 0x65, 0x52, 0x47, 0x42, + 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, + 0x4c, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x2e, 0x4c, 0x6c, 0x63, 0x6d, 0x73, + 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, + 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1a, 0x61, 0x63, 0x73, 0x70, + 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0x01, 0xb0, 0x2e, 0xee, - 0x85, 0x7f, 0x77, 0x02, 0x0e, 0x9d, 0x0a, 0x7d, - 0x1b, 0xa9, 0xb1, 0x20, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0x45, 0xf2, 0x83, 0x9f, + 0x85, 0x17, 0x09, 0x16, 0x68, 0xc7, 0x76, 0xe4, + 0x78, 0xbf, 0xeb, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x30, 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x50, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0a, 0x64, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0a, 0x78, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0c, 0xd4, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0xe8, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xa4, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0a, 0xb8, + 0x00, 0x00, 0x0d, 0x14, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0d, 0x28, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xcc, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe0, + 0x00, 0x00, 0x0d, 0x3c, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x50, 0x00, 0x00, 0x00, 0x10, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0a, 0xe0, 0x00, 0x00, 0x00, 0x10, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe0, + 0x00, 0x00, 0x0d, 0x50, 0x00, 0x00, 0x00, 0x10, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x50, 0x00, 0x00, 0x00, 0x10, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0a, 0xf0, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0b, 0x14, - 0x00, 0x00, 0x01, 0x92, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x0c, 0xa8, 0x00, 0x00, 0x1b, 0x36, + 0x00, 0x00, 0x0d, 0x60, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0d, 0x84, + 0x00, 0x00, 0x01, 0x90, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x0f, 0x14, 0x00, 0x00, 0x1f, 0x38, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x14, @@ -3609,34 +3876,43 @@ 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x6a, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x52, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x01, 0xcc, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0x48, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, - 0x00, 0x00, 0x02, 0xf8, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x76, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x9a, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x02, 0x14, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x02, 0x82, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x02, 0xfe, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xae, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x03, 0xe6, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x04, 0x5a, + 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0xd2, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x05, 0xfa, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x06, 0x28, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0x5c, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x05, 0x80, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x05, 0xf4, + 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x06, 0x7a, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x07, 0x02, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x07, 0x7c, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0xee, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x08, 0x7e, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x08, 0xf8, + 0x00, 0x00, 0x08, 0x56, 0x73, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x08, 0xde, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x09, 0x52, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x09, 0xcc, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x0a, 0x3e, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x0a, 0xce, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x0b, 0x48, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -3665,59 +3941,87 @@ 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, - 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, - 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x72, 0x00, 0xe6, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, + 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, + 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, + 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, - 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0xed, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0xf1, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, @@ -3768,94 +4072,131 @@ 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, 0x30, 0x59, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x00, 0xc7, 0x91, 0xad, 0x8c, 0x00, 0x20, + 0xc8, 0x1c, 0xd5, 0x5c, 0xc7, 0x3c, 0xb8, 0x5c, + 0xbd, 0x80, 0xd1, 0x30, 0x00, 0x20, 0xc7, 0x90, + 0xc7, 0x20, 0xb8, 0x6d, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, - 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x3e, - 0x04, 0x31, 0x04, 0x3e, 0x04, 0x52, 0x04, 0x35, - 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x5a, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x30, 0x04, 0x43, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x41, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, - 0x04, 0x30, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0xe5, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x01, 0x7e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xfd, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, + 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x3e, + 0x04, 0x31, 0x04, 0x3e, 0x04, 0x52, 0x04, 0x35, + 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x5a, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x30, 0x04, 0x43, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x41, + 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, + 0x04, 0x30, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe4, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0xe5, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, 0x00, 0x65, 0x00, 0x67, @@ -3898,7 +4239,11 @@ 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, - 0x52, 0x36, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, + 0x52, 0x36, 0x00, 0x00, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x51, 0x4d, + 0x4e, 0x8e, 0x5d, 0xf2, 0x77, 0xe5, 0x76, 0x84, + 0x72, 0x48, 0x67, 0x43, 0x96, 0x50, 0x52, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, 0x00, 0x00, 0x00, 0x00, @@ -3924,76 +4269,80 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x96, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa2, - 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xca, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd2, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe8, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf4, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x08, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x2a, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x46, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x01, 0x58, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x66, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x6c, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x82, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xc8, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd0, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe6, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf2, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x06, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x28, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x44, + 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x01, 0x56, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x64, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x6a, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x47, - 0x00, 0x41, 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, - 0x00, 0x5f, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x29, 0x00, 0x30, - 0x00, 0x2e, 0x00, 0x38, 0x00, 0x31, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, - 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x61, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, - 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, - 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x00, - 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0c, - 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x01, 0xce, - 0x00, 0x00, 0x00, 0xb8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xf0, 0x00, 0x00, 0x02, 0x86, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x47, 0x00, 0x41, + 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, 0x00, 0x5f, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x29, 0x00, 0x30, 0x00, 0x2e, + 0x00, 0x38, 0x00, 0x31, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, + 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, + 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x64, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, + 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, + 0x00, 0x00, 0x01, 0xce, 0x00, 0x00, 0x00, 0xdc, + 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf0, + 0x00, 0x00, 0x02, 0xaa, 0x64, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xcc, 0x00, 0x00, 0x04, 0x9a, 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe2, - 0x00, 0x00, 0x04, 0x76, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x16, 0x00, 0x00, 0x06, 0x58, + 0x00, 0x00, 0x06, 0x66, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x16, 0x00, 0x00, 0x08, 0x48, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe2, - 0x00, 0x00, 0x08, 0x6e, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x0a, 0x50, - 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x02, 0x5a, - 0x00, 0x00, 0x0c, 0x48, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, 0x0e, 0xa2, - 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x02, 0x48, - 0x00, 0x00, 0x10, 0xa6, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xda, 0x00, 0x00, 0x12, 0xee, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x01, 0xca, - 0x00, 0x00, 0x14, 0xc8, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xea, 0x00, 0x00, 0x16, 0x92, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe6, - 0x00, 0x00, 0x18, 0x7c, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x1a, 0x62, + 0x00, 0x00, 0x0a, 0x5e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x0c, 0x40, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x30, + 0x00, 0x00, 0x0e, 0x38, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x5a, 0x00, 0x00, 0x0f, 0x68, + 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x02, 0x04, + 0x00, 0x00, 0x11, 0xc2, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x48, 0x00, 0x00, 0x13, 0xc6, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0xda, + 0x00, 0x00, 0x16, 0x0e, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xca, 0x00, 0x00, 0x17, 0xe8, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0xea, + 0x00, 0x00, 0x19, 0xb2, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xe6, 0x00, 0x00, 0x1b, 0x9c, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0xd4, + 0x00, 0x00, 0x1d, 0x82, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0xe2, 0x00, 0x00, 0x1e, 0x56, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x67, 0x00, 0x61, 0x00, 0x63, 0x00, 0x79, 0x00, 0x20, @@ -4114,804 +4463,934 @@ 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x7a, 0x00, 0x6b, 0x01, 0x6f, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x75, 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x72, 0x00, 0x73, - 0x00, 0x70, 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x66, 0x00, 0xfc, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0xe6, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x76, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, 0x00, 0x66, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x72, 0x00, 0x75, 0x00, 0x67, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x66, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x20, 0x00, 0x4d, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0xe4, 0x00, 0x68, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x68, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x68, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x66, 0x00, 0xfc, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x42, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x64, 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, 0x00, 0x42, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x77, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x2e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xbd, 0x03, 0xcc, 0x03, 0xbc, 0x03, 0xb9, - 0x03, 0xbc, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, - 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb7, - 0x03, 0xbc, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc1, 0x03, 0xb3, 0x03, 0xae, 0x03, 0xb8, - 0x03, 0xb7, 0x03, 0xba, 0x03, 0xb5, 0x00, 0x20, - 0x03, 0xb1, 0x03, 0xc1, 0x03, 0xc7, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xac, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x20, 0x03, 0xb3, 0x03, 0xb9, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xae, - 0x03, 0xc3, 0x03, 0xb7, 0x00, 0x20, 0x03, 0xbc, - 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, 0x03, 0xba, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x03, 0x94, - 0x03, 0xb5, 0x03, 0xb4, 0x03, 0xbf, 0x03, 0xbc, - 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x03, 0xc5, - 0x00, 0x20, 0x03, 0xcc, 0x03, 0xc4, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb2, 0x03, 0xb1, 0x03, 0xc3, - 0x03, 0xaf, 0x03, 0xb6, 0x03, 0xb5, 0x03, 0xc4, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc3, - 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xc9, 0x03, 0xc4, 0x03, 0xcc, - 0x03, 0xc4, 0x03, 0xc5, 0x03, 0xc0, 0x03, 0xb7, - 0x00, 0x20, 0x03, 0xbf, 0x03, 0xb8, 0x03, 0xcc, - 0x03, 0xbd, 0x03, 0xb7, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xb7, 0x03, 0xc2, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb1, 0x03, 0xc1, 0x03, 0xcc, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xb9, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb5, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xad, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xbd, - 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, - 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb9, - 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xc4, 0x03, 0xb1, - 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc9, 0x03, 0xc2, - 0x00, 0x20, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, - 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, - 0x03, 0xbf, 0x03, 0xb8, 0x03, 0xcc, 0x03, 0xbd, - 0x03, 0xb7, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xae, - 0x00, 0x20, 0x03, 0xb3, 0x03, 0xb9, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xbd, 0x03, 0xad, 0x03, 0xb5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xb5, - 0x03, 0xc2, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x68, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x70, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, - 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x76, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0xe1, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x51, 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x67, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x79, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x6f, 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, - 0x00, 0xe9, 0x00, 0x20, 0x00, 0xe8, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x20, 0x00, 0xe8, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x62, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x70, 0x00, 0xe5, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, + 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x2d, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0xe6, 0x00, 0x72, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x76, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0xf8, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x75, 0x00, 0x67, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe6, + 0x00, 0x72, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x72, 0x00, 0x73, 0x00, 0x70, 0x00, 0x72, + 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, 0x00, 0xfc, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, + 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x74, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x66, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, + 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x4d, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0xe4, + 0x00, 0x68, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x68, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x68, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x75, 0x00, 0x6f, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x67, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6e, - 0x00, 0x6f, 0x01, 0x5b, 0x00, 0x63, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x01, 0x42, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x77, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x7a, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x72, 0x00, 0x6d, - 0x01, 0x19, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x75, - 0x01, 0x7c, 0x00, 0x79, 0x00, 0x63, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x67, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, + 0x00, 0xfc, 0x00, 0x72, 0x00, 0x20, 0x00, 0x42, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x73, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x72, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x42, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x77, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x77, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x2e, 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, + 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xbd, 0x03, 0xcc, + 0x03, 0xbc, 0x03, 0xb9, 0x03, 0xbc, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, + 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, + 0x03, 0xb4, 0x03, 0xb7, 0x03, 0xbc, 0x03, 0xb9, + 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc1, 0x03, 0xb3, + 0x03, 0xae, 0x03, 0xb8, 0x03, 0xb7, 0x03, 0xba, + 0x03, 0xb5, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc1, + 0x03, 0xc7, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xac, + 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, + 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x03, 0xb3, + 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, + 0x03, 0xc1, 0x03, 0xae, 0x03, 0xc3, 0x03, 0xb7, + 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, + 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x2e, + 0x00, 0x20, 0x03, 0x94, 0x03, 0xb5, 0x03, 0xb4, + 0x03, 0xbf, 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, + 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x20, 0x03, 0xcc, + 0x03, 0xc4, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb2, + 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xaf, 0x03, 0xb6, + 0x03, 0xb5, 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xc9, + 0x03, 0xc4, 0x03, 0xcc, 0x03, 0xc4, 0x03, 0xc5, + 0x03, 0xc0, 0x03, 0xb7, 0x00, 0x20, 0x03, 0xbf, + 0x03, 0xb8, 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xb7, + 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xc2, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, + 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x03, 0xba, + 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb5, + 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xc1, + 0x03, 0xcc, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xb9, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb5, + 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x2c, 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb5, + 0x03, 0xbd, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, + 0x03, 0xad, 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, + 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xb7, 0x03, 0xc3, + 0x03, 0xb9, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xc0, + 0x03, 0xbf, 0x03, 0xb9, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xc9, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xad, + 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xbf, 0x03, 0xb8, + 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xb7, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xae, 0x00, 0x20, 0x03, 0xb3, + 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xbd, + 0x03, 0xad, 0x03, 0xb5, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xcc, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc2, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x68, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x66, 0x00, 0x75, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x49, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x5a, 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x7a, 0x00, 0x67, 0x00, 0x6c, 0x01, 0x19, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x2c, 0x00, 0x20, 0x01, 0x7c, 0x00, 0x65, + 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0xe1, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, + 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x62, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x76, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0xe1, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x51, 0x00, 0x75, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x74, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x67, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6e, - 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x67, + 0x00, 0x61, 0x00, 0x63, 0x00, 0x79, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x50, 0x00, 0x6f, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x68, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0xe8, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, + 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, + 0x00, 0xe8, 0x00, 0x20, 0x00, 0x73, 0x00, 0x69, + 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x76, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x62, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x75, + 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x2e, 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, + 0xc6, 0x24, 0xb7, 0x98, 0xb4, 0x1c, 0x00, 0x20, + 0xae, 0x30, 0xc8, 0x74, 0x00, 0x20, 0xd5, 0x04, + 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, + 0x00, 0x20, 0xc6, 0xd0, 0xb7, 0x98, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x65, 0xc5, 0xd0, 0xc1, 0x1c, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, + 0x00, 0x70, 0xac, 0xfc, 0x00, 0x20, 0x00, 0x49, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0xc5, 0xd0, 0xc1, 0x1c, + 0x00, 0x20, 0xc0, 0xac, 0xc6, 0xa9, 0xd5, 0x58, + 0xb8, 0x24, 0xac, 0xe0, 0x00, 0x20, 0xb9, 0xcc, + 0xb4, 0xe4, 0xc5, 0xc8, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, 0xae, 0x30, + 0xc8, 0x74, 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, 0x01, 0x07, - 0x00, 0x20, 0x00, 0x75, 0x01, 0x7c, 0x00, 0x79, - 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0xba, 0xa8, 0xb2, 0xc8, 0xd1, 0x30, 0xb9, 0x7c, + 0x00, 0x20, 0xae, 0x30, 0xbc, 0x18, 0xc7, 0x3c, + 0xb8, 0x5c, 0x00, 0x20, 0xd5, 0x58, 0xba, 0x70, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0xc6, 0x40, 0x00, 0x20, 0xc7, 0x20, + 0xc0, 0xac, 0xd5, 0x58, 0xbb, 0xc0, 0xb8, 0x5c, + 0x00, 0x2c, 0x00, 0x20, 0xb5, 0x14, 0xc2, 0xa4, + 0xd5, 0x0c, 0xb8, 0x08, 0xc7, 0x74, 0x00, 0x20, + 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, + 0xb8, 0x5c, 0x00, 0x20, 0xc0, 0xac, 0xc6, 0xa9, + 0xd5, 0x58, 0xac, 0x70, 0xb0, 0x98, 0x00, 0x20, + 0xc0, 0xc8, 0x00, 0x20, 0xc7, 0x74, 0xbb, 0xf8, + 0xc9, 0xc0, 0xb9, 0x7c, 0x00, 0x20, 0xd3, 0xb8, + 0xc9, 0xd1, 0xd5, 0x60, 0x00, 0x20, 0xc6, 0xa9, + 0xb3, 0xc4, 0xb8, 0x5c, 0x00, 0x20, 0xc0, 0xac, + 0xc6, 0xa9, 0xd5, 0x58, 0xba, 0x74, 0x00, 0x20, + 0xc5, 0x48, 0xb4, 0x29, 0xb2, 0xc8, 0xb2, 0xe4, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x79, 0x01, 0x5b, 0x00, 0x77, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x74, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x62, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x77, - 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x7a, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x67, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x6e, 0x00, 0x6f, 0x01, 0x5b, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x01, 0x42, 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x77, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x7a, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x7a, 0x00, 0x20, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x6d, 0x01, 0x19, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x75, 0x01, 0x7c, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x7a, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x5a, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x7a, 0x00, 0x67, + 0x00, 0x6c, 0x01, 0x19, 0x00, 0x64, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x2c, 0x00, 0x20, + 0x01, 0x7c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x74, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x79, + 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x77, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, - 0x00, 0x22, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, - 0x00, 0xe9, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x77, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x79, 0x01, 0x07, 0x00, 0x20, 0x00, 0x75, + 0x01, 0x7c, 0x00, 0x79, 0x00, 0x77, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x6a, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, + 0x01, 0x5b, 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x75, 0x00, 0x62, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x6f, 0x00, 0x77, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, 0x00, 0xf3, + 0x00, 0x77, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x62, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x49, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1f, - 0x04, 0x35, 0x04, 0x40, 0x04, 0x32, 0x04, 0x3e, - 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, 0x04, 0x30, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0xe3, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x76, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x76, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x2e, + 0x00, 0x00, 0x04, 0x1f, 0x04, 0x35, 0x04, 0x40, + 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x30, + 0x04, 0x47, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x4d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x43, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x40, 0x04, 0x35, 0x04, 0x32, 0x04, 0x48, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x4b, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x3e, 0x04, 0x37, 0x04, 0x34, 0x04, 0x30, + 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x37, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x41, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x3c, 0x04, 0x3c, 0x04, 0x30, 0x04, 0x3c, + 0x04, 0x38, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, + 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, + 0x04, 0x38, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x22, + 0x04, 0x30, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x3d, 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x37, 0x04, 0x40, 0x04, 0x30, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x33, 0x04, 0x38, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x4d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x43, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x40, 0x04, 0x35, - 0x04, 0x32, 0x04, 0x48, 0x04, 0x38, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x4b, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x3e, 0x04, 0x37, - 0x04, 0x34, 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x35, - 0x04, 0x39, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x00, 0x31, + 0x00, 0x33, 0x00, 0x2d, 0x04, 0x34, 0x04, 0x4e, + 0x04, 0x39, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x30, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x45, + 0x04, 0x3e, 0x04, 0x36, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x30, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x35, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x3b, 0x04, 0x35, 0x04, 0x34, 0x04, 0x43, + 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, + 0x04, 0x3b, 0x04, 0x35, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x41, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x3c, 0x04, 0x3c, - 0x04, 0x30, 0x04, 0x3c, 0x04, 0x38, 0x00, 0x20, - 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x22, 0x04, 0x30, 0x04, 0x3a, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x3d, 0x00, 0x20, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x42, - 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x38, 0x04, 0x33, 0x04, 0x38, - 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, - 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, 0x00, 0x2d, - 0x04, 0x34, 0x04, 0x4e, 0x04, 0x39, 0x04, 0x3c, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x3e, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, - 0x04, 0x3d, 0x04, 0x38, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x30, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x45, 0x04, 0x3e, 0x04, 0x36, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x35, 0x04, 0x33, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x35, - 0x04, 0x34, 0x04, 0x43, 0x04, 0x35, 0x04, 0x42, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x34, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3b, 0x04, 0x35, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x40, 0x04, 0x35, 0x04, 0x3c, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, - 0x04, 0x45, 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x39, 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, 0x04, 0x40, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x10, 0x04, 0x34, 0x04, 0x3e, - 0x04, 0x31, 0x04, 0x35, 0x00, 0x20, 0x04, 0x37, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x43, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x42, 0x04, 0x40, 0x04, 0x35, - 0x04, 0x31, 0x04, 0x43, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x24, 0x04, 0x3e, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x48, 0x04, 0x3e, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3c, 0x00, 0x20, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x18, 0x04, 0x3b, - 0x04, 0x43, 0x04, 0x41, 0x04, 0x42, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x3c, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x17, 0x04, 0x30, 0x04, 0x42, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x48, 0x04, 0x42, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x30, 0x04, 0x41, 0x04, 0x3d, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x3c, - 0x00, 0x20, 0x04, 0x15, 0x04, 0x3f, 0x04, 0x3b, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3c, - 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, - 0x00, 0x20, 0x04, 0x20, 0x04, 0x13, 0x04, 0x11, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x30, 0x04, 0x42, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x48, 0x04, 0x42, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x41, 0x04, 0x20, - 0x04, 0x13, 0x04, 0x11, 0x00, 0x2d, 0x04, 0x3e, - 0x04, 0x3c, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3d, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x42, 0x04, 0x40, - 0x04, 0x35, 0x04, 0x31, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x37, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, + 0x04, 0x38, 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, 0x00, 0x2e, + 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x58, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x30, 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x10, + 0x04, 0x34, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x35, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x3a, 0x04, 0x35, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, - 0x00, 0x72, 0x00, 0xe5, 0x00, 0x6c, 0x00, 0x64, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, 0x00, 0xe5, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, 0x00, 0xf6, - 0x00, 0x72, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, - 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, + 0x04, 0x43, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x42, + 0x04, 0x40, 0x04, 0x35, 0x04, 0x31, 0x04, 0x43, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x24, 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x48, 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x3c, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x18, 0x04, 0x3b, 0x04, 0x43, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x40, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x3c, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x17, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x48, + 0x04, 0x42, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, + 0x04, 0x41, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, + 0x04, 0x32, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x15, + 0x04, 0x3f, 0x04, 0x3b, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x3c, 0x00, 0x20, 0x00, 0x31, + 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, 0x04, 0x20, + 0x04, 0x13, 0x04, 0x11, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x48, + 0x04, 0x42, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x30, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x20, 0x04, 0x13, 0x04, 0x11, + 0x00, 0x2d, 0x04, 0x3e, 0x04, 0x3c, 0x00, 0x2c, + 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x40, 0x04, 0x35, 0x04, 0x31, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x35, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, 0x00, 0xe5, + 0x00, 0x6c, 0x00, 0x64, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x72, 0x00, 0xe5, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x62, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x6a, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x49, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x45, 0x00, 0x66, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x70, 0x00, 0xe5, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, + 0x00, 0x22, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x66, 0x00, 0xe4, + 0x00, 0x72, 0x00, 0x67, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xe4, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0xf6, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x6d, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x66, + 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x61, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x42, + 0x00, 0x75, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xf6, 0x00, 0x7a, + 0x00, 0x67, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x66, 0x01, 0x31, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x45, 0x00, 0x66, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x70, 0x00, 0xe5, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, + 0x01, 0x31, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x6b, 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x75, 0x01, 0x5f, 0x00, 0x74, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x6d, 0x00, 0x75, 0x01, 0x5f, 0x00, 0x74, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0xd6, 0x00, 0x7a, 0x00, 0x67, 0x00, 0xfc, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, + 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe4, 0x00, 0x72, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6c, + 0x01, 0x31, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x62, - 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x42, 0x00, 0x75, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x42, 0x00, 0x69, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, + 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x74, 0x00, 0xfc, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0xf6, 0x00, 0x7a, 0x00, 0x67, 0x00, 0xfc, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, - 0x01, 0x31, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x49, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, + 0x00, 0x79, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x79, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6d, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x75, - 0x01, 0x5f, 0x00, 0x74, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x75, - 0x01, 0x5f, 0x00, 0x74, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0xd6, 0x00, 0x7a, - 0x00, 0x67, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, - 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6b, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6c, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, + 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x6c, 0x01, 0x31, 0x00, 0x64, + 0x01, 0x31, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x1f, 0x04, 0x35, 0x04, 0x40, 0x04, 0x48, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x32, 0x04, 0x35, + 0x04, 0x40, 0x04, 0x41, 0x04, 0x56, 0x04, 0x4e, + 0x00, 0x20, 0x04, 0x46, 0x04, 0x4c, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x30, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x40, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, + 0x04, 0x3b, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x43, 0x04, 0x3b, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, + 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x56, + 0x04, 0x54, 0x04, 0x4e, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, + 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x12, 0x04, 0x56, + 0x04, 0x3d, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, 0x04, 0x32, + 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x30, 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, + 0x00, 0x2d, 0x04, 0x34, 0x04, 0x4e, 0x04, 0x39, + 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3e, + 0x04, 0x3c, 0x04, 0x43, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x56, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x7a, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x42, - 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, 0x00, 0x67, - 0x00, 0xf6, 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0xfc, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x6b, 0x00, 0x20, 0x00, 0x79, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x79, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x6d, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6c, - 0x01, 0x31, 0x00, 0x64, 0x01, 0x31, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1f, 0x04, 0x35, - 0x04, 0x40, 0x04, 0x48, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, 0x04, 0x41, - 0x04, 0x56, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x46, - 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x40, 0x04, 0x56, - 0x04, 0x3b, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4e, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x43, 0x04, 0x3b, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x32, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x56, 0x04, 0x54, 0x04, 0x4e, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x43, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, - 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, 0x00, 0x49, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x12, 0x04, 0x56, 0x04, 0x3d, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x19, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x3b, 0x04, 0x56, 0x04, 0x34, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x43, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x32, 0x04, 0x41, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x33, 0x00, 0x2d, 0x04, 0x34, - 0x04, 0x4e, 0x04, 0x39, 0x04, 0x3c, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, - 0x04, 0x56, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x56, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, - 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x19, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x56, - 0x04, 0x34, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x4f, 0x04, 0x3a, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x37, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x45, 0x00, 0x20, 0x04, 0x37, 0x04, 0x3e, - 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x4c, 0x00, 0x2e, - 0x00, 0x00, 0x6b, 0x64, 0x90, 0x7a, 0x8e, 0x5f, - 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x00, - 0x52, 0x1d, 0x66, 0x2f, 0x75, 0x31, 0x00, 0x20, - 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x20, 0x62, 0x40, 0x5e, 0xfa, - 0x7a, 0xcb, 0xff, 0x0c, 0x75, 0x28, 0x65, 0xbc, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x4f, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, + 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x3e, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x37, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, + 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x4c, 0x00, 0x2e, 0x00, 0x00, 0x6b, 0x64, + 0x90, 0x7a, 0x8e, 0x5f, 0x63, 0xcf, 0x8f, 0xf0, + 0x6a, 0x94, 0x67, 0x00, 0x52, 0x1d, 0x66, 0x2f, + 0x75, 0x31, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x62, 0x40, 0x5e, 0xfa, 0x7a, 0xcb, 0xff, 0x0c, + 0x75, 0x28, 0x65, 0xbc, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x20, 0x82, 0x07, 0x00, 0x20, 0x00, 0x49, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x30, 0x02, 0x5b, 0x83, + 0x66, 0x2f, 0x68, 0x39, 0x64, 0xda, 0x53, 0x9f, + 0x59, 0xcb, 0x76, 0x84, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, 0x00, 0x22, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x87, 0xa2, 0x5e, 0x55, 0x62, 0x40, + 0x88, 0xfd, 0x4f, 0x5c, 0xff, 0x0c, 0x98, 0x5e, + 0x4f, 0x3c, 0x65, 0xbc, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0xff, 0x0c, + 0x4e, 0x0d, 0x61, 0xc9, 0x75, 0x28, 0x4f, 0x5c, + 0x98, 0x6f, 0x79, 0x3a, 0x56, 0x68, 0x76, 0x84, + 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0xff, 0x0c, + 0x62, 0x16, 0x66, 0x2f, 0x75, 0x28, 0x65, 0xbc, + 0x65, 0xb0, 0x5f, 0x71, 0x50, 0xcf, 0x30, 0x02, + 0x00, 0x00, 0x8b, 0xe5, 0x80, 0x01, 0x5f, 0x0f, + 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, + 0x66, 0x2f, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x51, 0x6c, 0x53, 0xf8, 0x67, 0x00, 0x52, 0x1d, + 0x52, 0x1b, 0x5e, 0xfa, 0x75, 0x28, 0x4e, 0x8e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x70, 0x00, 0x20, 0x82, 0x07, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x68, 0x00, 0x70, 0x00, 0x20, 0x54, 0x8c, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x30, 0x02, 0x5b, 0x83, 0x66, 0x2f, 0x68, 0x39, - 0x64, 0xda, 0x53, 0x9f, 0x59, 0xcb, 0x76, 0x84, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, - 0x00, 0x33, 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x87, 0xa2, - 0x5e, 0x55, 0x62, 0x40, 0x88, 0xfd, 0x4f, 0x5c, - 0xff, 0x0c, 0x98, 0x5e, 0x4f, 0x3c, 0x65, 0xbc, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0xff, 0x0c, 0x4e, 0x0d, 0x61, 0xc9, - 0x75, 0x28, 0x4f, 0x5c, 0x98, 0x6f, 0x79, 0x3a, - 0x56, 0x68, 0x76, 0x84, 0x63, 0xcf, 0x8f, 0xf0, - 0x6a, 0x94, 0xff, 0x0c, 0x62, 0x16, 0x66, 0x2f, - 0x75, 0x28, 0x65, 0xbc, 0x65, 0xb0, 0x5f, 0x71, - 0x50, 0xcf, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x53, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x52, - 0x65, 0x64, 0x41, 0x6e, 0x64, 0x47, 0x72, 0x65, - 0x65, 0x6e, 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, - 0x3c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x28, 0x3c, 0x6c, 0x63, 0x6d, 0x73, + 0x00, 0x20, 0x76, 0x84, 0x30, 0x02, 0x75, 0x31, + 0x4e, 0x8e, 0x5b, 0x83, 0x57, 0xfa, 0x4e, 0x8e, + 0x53, 0x9f, 0x67, 0x09, 0x76, 0x84, 0x82, 0xf9, + 0x67, 0x9c, 0x00, 0x20, 0x00, 0x31, 0x00, 0x33, + 0x00, 0x22, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x66, 0x3e, 0x79, 0x3a, + 0x56, 0x68, 0xff, 0x0c, 0x5e, 0x76, 0x4e, 0x14, + 0x4e, 0x0e, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x76, 0xf8, + 0x8f, 0xd1, 0xff, 0x0c, 0x56, 0xe0, 0x6b, 0x64, + 0x5b, 0x83, 0x4e, 0x0d, 0x5e, 0x94, 0x5f, 0x53, + 0x75, 0x28, 0x4f, 0x5c, 0x66, 0x3e, 0x79, 0x3a, + 0x56, 0x68, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x62, 0x16, 0x75, 0x28, 0x4e, 0x8e, + 0x73, 0xb0, 0x57, 0x28, 0x8f, 0x83, 0x65, 0xb0, + 0x76, 0x84, 0x56, 0xfe, 0x50, 0xcf, 0x4e, 0x2d, + 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x53, 0x77, 0x61, 0x70, + 0x70, 0x65, 0x64, 0x52, 0x65, 0x64, 0x41, 0x6e, + 0x64, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x2e, 0x69, + 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x2c, 0xc0, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x35, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x20, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0x5f, 0x90, 0x3b, 0x23, - 0x8a, 0xf1, 0x94, 0x77, 0x49, 0x1a, 0xdf, 0x6e, - 0x1d, 0xec, 0x61, 0xab, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0x4a, 0xc7, 0x18, 0xe1, + 0xc0, 0xdb, 0x5e, 0x8f, 0x5f, 0x3d, 0xea, 0x41, + 0x89, 0xaf, 0x6e, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, - 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x04, 0x50, - 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x05, 0x70, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0e, 0x84, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0e, 0x98, + 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x05, 0x0e, + 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x06, 0x30, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x11, 0xb4, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x11, 0xc8, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0e, 0xc4, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0e, 0xd8, + 0x00, 0x00, 0x11, 0xf4, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x12, 0x08, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0e, 0xec, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0f, 0x00, + 0x00, 0x00, 0x12, 0x1c, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x12, 0x30, 0x00, 0x00, 0x00, 0x20, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x20, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0f, 0x00, + 0x00, 0x00, 0x12, 0x30, 0x00, 0x00, 0x00, 0x20, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x12, 0x30, 0x00, 0x00, 0x00, 0x20, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0f, 0x20, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0f, 0x44, - 0x00, 0x00, 0x01, 0x0c, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x10, 0x50, 0x00, 0x00, 0x17, 0xec, + 0x00, 0x00, 0x12, 0x50, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x12, 0x74, + 0x00, 0x00, 0x01, 0x0a, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x13, 0x80, 0x00, 0x00, 0x19, 0x3e, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x2c, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x01, 0x14, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, - 0x00, 0x00, 0x01, 0x4a, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x01, 0x7a, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, - 0x00, 0x00, 0x01, 0xc4, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x01, 0xfc, + 0x00, 0x00, 0x01, 0x18, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x01, 0x44, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, + 0x00, 0x00, 0x01, 0x7a, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x01, 0xa6, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, + 0x00, 0x00, 0x01, 0xd6, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x02, 0x20, + 0x66, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, + 0x00, 0x00, 0x02, 0x58, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x02, 0x86, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, - 0x00, 0x00, 0x02, 0x2e, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x02, 0x5e, + 0x00, 0x00, 0x02, 0xb8, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x02, 0xe8, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x02, 0x8e, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x02, 0xa4, - 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, - 0x00, 0x00, 0x02, 0xcc, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x03, 0x0e, - 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, - 0x00, 0x00, 0x03, 0x42, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x03, 0x7c, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, - 0x00, 0x00, 0x03, 0xb0, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x03, 0xd8, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, - 0x00, 0x00, 0x04, 0x12, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x04, 0x46, + 0x00, 0x00, 0x03, 0x18, 0x6e, 0x62, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x03, 0x2e, + 0x6e, 0x62, 0x4e, 0x4f, 0x00, 0x00, 0x00, 0x28, + 0x00, 0x00, 0x03, 0x56, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x03, 0x7e, + 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x00, 0x34, + 0x00, 0x00, 0x03, 0xc0, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x03, 0xf4, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, + 0x00, 0x00, 0x04, 0x2e, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x04, 0x62, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, + 0x00, 0x00, 0x04, 0x8a, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x04, 0xc4, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x0a, + 0x00, 0x00, 0x04, 0xf8, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x05, 0x02, 0x00, 0x53, 0x00, 0x77, 0x00, 0x61, 0x00, 0x70, 0x00, 0x70, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x52, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, @@ -4924,132 +5403,159 @@ 0x00, 0x65, 0x00, 0x6e, 0x00, 0xe1, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, 0x00, 0xe1, - 0x00, 0x00, 0x00, 0x52, 0x00, 0x6f, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x47, 0x00, 0x72, 0x00, 0xfc, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x74, 0x00, 0x61, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x00, 0x03, 0x91, 0x03, 0xbb, 0x03, 0xbb, - 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xae, 0x00, 0x20, - 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xcc, - 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xba, 0x03, 0xcc, 0x03, 0xba, 0x03, 0xba, - 0x03, 0xb9, 0x03, 0xbd, 0x03, 0xbf, 0x03, 0xc5, - 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xac, - 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbd, 0x03, 0xbf, - 0x03, 0xc5, 0x00, 0x00, 0x00, 0x49, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x6d, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x6f, 0x00, 0x6a, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x56, 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x00, 0x00, 0x46, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x63, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x72, 0x00, 0xe9, 0x00, 0x6c, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x69, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x7a, 0x00, 0xf6, - 0x00, 0x6c, 0x00, 0x64, 0x00, 0x00, 0x00, 0x4d, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x48, 0x00, 0x69, 0x00, 0x6a, - 0x00, 0x61, 0x00, 0x75, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x75, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x00, 0x00, 0x52, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x00, 0x4e, 0xa4, - 0x63, 0xdb, 0x30, 0x55, 0x30, 0x8c, 0x30, 0x5f, - 0x8d, 0x64, 0x30, 0x4a, 0x30, 0x88, 0x30, 0x73, - 0x7d, 0xd1, 0x00, 0x00, 0x00, 0x42, 0x00, 0x79, - 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x52, 0x00, 0xf8, 0x00, 0x64, + 0x00, 0x00, 0x00, 0x52, 0x00, 0xf8, 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x20, - 0x00, 0x47, 0x00, 0x72, 0x00, 0xf8, 0x00, 0x6e, - 0x00, 0x6e, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x61, - 0x00, 0x6d, 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x77, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x6b, - 0x00, 0x69, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x54, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x00, 0x04, 0x18, 0x04, 0x3d, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x40, 0x04, 0x41, 0x04, 0x38, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x41, 0x04, 0x3d, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x35, 0x04, 0x3b, - 0x04, 0x51, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x3e, 0x00, 0x00, 0x04, 0x20, 0x04, 0x30, - 0x04, 0x37, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x5a, + 0x00, 0x67, 0x00, 0x72, 0x00, 0xf8, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, 0x00, 0x74, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x52, + 0x00, 0x6f, 0x00, 0x74, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x47, + 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x75, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x74, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, + 0x03, 0xae, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xb9, + 0x03, 0xba, 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xbd, 0x00, 0x20, 0x03, 0xba, 0x03, 0xcc, + 0x03, 0xba, 0x03, 0xba, 0x03, 0xb9, 0x03, 0xbd, + 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x20, 0x03, 0xba, + 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xac, 0x03, 0xc3, 0x03, 0xb9, + 0x03, 0xbd, 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x00, + 0x00, 0x49, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6d, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x6f, 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x56, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, 0x00, 0x00, + 0x00, 0x52, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, + 0x00, 0xe9, 0x00, 0x73, 0x00, 0x00, 0x00, 0x46, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x63, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x72, 0x00, 0xe9, 0x00, 0x6c, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, + 0x00, 0xe9, 0x00, 0x73, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0xf6, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x00, + 0x00, 0x4d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x48, 0x00, 0x69, + 0x00, 0x6a, 0x00, 0x61, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, 0x00, 0x75, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x52, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, 0x00, 0x00, + 0x4e, 0xa4, 0x63, 0xdb, 0x30, 0x55, 0x30, 0x8c, + 0x30, 0x5f, 0x8d, 0x64, 0x30, 0x4a, 0x30, 0x88, + 0x30, 0x73, 0x7d, 0xd1, 0x00, 0x00, 0x00, 0x42, + 0x00, 0x79, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x52, 0x00, 0xf8, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, + 0x00, 0x20, 0x00, 0x47, 0x00, 0x72, 0x00, 0xf8, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x42, + 0x00, 0x79, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x52, 0x00, 0xf8, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, + 0x00, 0x20, 0x00, 0x47, 0x00, 0x72, 0x00, 0xf8, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x5a, + 0x00, 0x61, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x63, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x77, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x00, + 0x00, 0x54, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x68, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x00, 0x04, 0x18, 0x04, 0x3d, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, 0x04, 0x41, + 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x41, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, 0x04, 0x35, + 0x04, 0x3b, 0x04, 0x51, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x3e, 0x00, 0x00, 0x04, 0x20, + 0x04, 0x30, 0x04, 0x37, 0x04, 0x3c, 0x04, 0x35, + 0x04, 0x5a, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x46, 0x04, 0x40, 0x04, 0x32, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x46, 0x04, 0x40, 0x04, 0x32, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x35, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x00, - 0x00, 0x55, 0x00, 0x74, 0x00, 0x62, 0x00, 0x79, - 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, 0x00, 0x72, - 0x00, 0xf6, 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x67, - 0x00, 0x72, 0x00, 0xf6, 0x00, 0x6e, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x6d, 0x01, 0x31, 0x01, 0x5f, 0x00, 0x20, - 0x00, 0x4b, 0x01, 0x31, 0x00, 0x72, 0x00, 0x6d, - 0x01, 0x31, 0x00, 0x7a, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x59, - 0x00, 0x65, 0x01, 0x5f, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x00, 0x04, 0x06, 0x04, 0x3d, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x40, 0x04, 0x41, 0x04, 0x56, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x47, 0x04, 0x35, - 0x04, 0x40, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x2d, 0x04, 0x37, - 0x04, 0x35, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x7d, 0x05, - 0x7d, 0xa0, 0x4e, 0xa4, 0x63, 0xdb, 0x00, 0x00, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, 0x04, 0x35, + 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x30, + 0x00, 0x00, 0x00, 0x55, 0x00, 0x74, 0x00, 0x62, + 0x00, 0x79, 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x72, 0x00, 0xf6, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x67, 0x00, 0x72, 0x00, 0xf6, 0x00, 0x6e, + 0x00, 0x00, 0x00, 0x54, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x6d, 0x01, 0x31, 0x01, 0x5f, + 0x00, 0x20, 0x00, 0x4b, 0x01, 0x31, 0x00, 0x72, + 0x00, 0x6d, 0x01, 0x31, 0x00, 0x7a, 0x01, 0x31, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x59, 0x00, 0x65, 0x01, 0x5f, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x00, 0x04, 0x06, 0x04, 0x3d, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, 0x04, 0x41, + 0x04, 0x56, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x47, + 0x04, 0x35, 0x04, 0x40, 0x04, 0x32, 0x04, 0x3e, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, 0x00, 0x2d, + 0x04, 0x37, 0x04, 0x35, 0x04, 0x3b, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, + 0x7d, 0x05, 0x7d, 0xa0, 0x4e, 0xa4, 0x63, 0xdb, + 0x00, 0x00, 0x7e, 0xa2, 0x7e, 0xff, 0x82, 0x72, + 0x4e, 0x92, 0x63, 0x62, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x6a, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x52, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x01, 0xcc, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0x48, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, - 0x00, 0x00, 0x02, 0xf8, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x76, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x9a, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x02, 0x14, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x02, 0x82, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x02, 0xfe, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xae, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x03, 0xe6, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x04, 0x5a, + 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0xd2, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x05, 0xfa, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x06, 0x28, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0x5c, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x05, 0x80, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x05, 0xf4, + 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x06, 0x7a, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x07, 0x02, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x07, 0x7c, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0xee, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x08, 0x7e, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x08, 0xf8, + 0x00, 0x00, 0x08, 0x56, 0x73, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x08, 0xde, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x09, 0x52, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x09, 0xcc, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x0a, 0x3e, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x0a, 0xce, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x0b, 0x48, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -5078,62 +5584,90 @@ 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, - 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, - 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, - 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, - 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x72, 0x00, 0xe6, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, - 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, + 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, + 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, + 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, + 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0xed, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0xf1, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x7a, @@ -5181,70 +5715,107 @@ 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, 0x30, 0x59, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x00, 0xc7, 0x91, 0xad, 0x8c, 0x00, 0x20, + 0xc8, 0x1c, 0xd5, 0x5c, 0xc7, 0x3c, 0xb8, 0x5c, + 0xbd, 0x80, 0xd1, 0x30, 0x00, 0x20, 0xc7, 0x90, + 0xc7, 0x20, 0xb8, 0x6d, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x01, 0x7e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xfd, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, @@ -5311,7 +5882,11 @@ 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, - 0x52, 0x36, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, + 0x52, 0x36, 0x00, 0x00, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x51, 0x4d, + 0x4e, 0x8e, 0x5d, 0xf2, 0x77, 0xe5, 0x76, 0x84, + 0x72, 0x48, 0x67, 0x43, 0x96, 0x50, 0x52, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, 0x00, 0x00, 0x00, 0x00, @@ -5339,61 +5914,64 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x76, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x82, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x98, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa4, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xb8, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0xda, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xe8, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xee, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x04, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x96, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa2, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xb6, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0xd8, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xe6, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xec, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x4c, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, - 0x00, 0x30, 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, - 0x00, 0x41, 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x4c, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, + 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, + 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x01, 0x76, - 0x00, 0x00, 0x00, 0xc4, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x74, 0x00, 0x00, 0x02, 0x3a, + 0x00, 0x00, 0x00, 0xdc, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x74, 0x00, 0x00, 0x02, 0x52, 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x01, 0x9a, - 0x00, 0x00, 0x03, 0xae, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xbe, 0x00, 0x00, 0x05, 0x48, + 0x00, 0x00, 0x03, 0xc6, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xbe, 0x00, 0x00, 0x05, 0x60, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0xa4, - 0x00, 0x00, 0x07, 0x06, 0x66, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x8e, 0x00, 0x00, 0x08, 0xaa, + 0x00, 0x00, 0x07, 0x1e, 0x66, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x8e, 0x00, 0x00, 0x08, 0xc2, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc2, - 0x00, 0x00, 0x0a, 0x38, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x96, 0x00, 0x00, 0x0b, 0xfa, - 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x01, 0xac, - 0x00, 0x00, 0x0d, 0x90, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xac, 0x00, 0x00, 0x0f, 0x3c, - 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x6a, - 0x00, 0x00, 0x10, 0xe8, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x8a, 0x00, 0x00, 0x12, 0x52, - 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x94, - 0x00, 0x00, 0x13, 0xdc, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x08, 0x00, 0x00, 0x15, 0x70, - 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x17, 0x78, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x00, 0x0a, 0x50, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x0c, 0x12, + 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x96, + 0x00, 0x00, 0x0c, 0xd6, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x01, 0xac, 0x00, 0x00, 0x0e, 0x6c, + 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x01, 0xac, + 0x00, 0x00, 0x10, 0x18, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x6a, 0x00, 0x00, 0x11, 0xc4, + 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8a, + 0x00, 0x00, 0x13, 0x2e, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x94, 0x00, 0x00, 0x14, 0xb8, + 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, + 0x00, 0x00, 0x16, 0x4c, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x18, 0x54, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0x76, + 0x00, 0x00, 0x18, 0xc8, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, @@ -5752,429 +6330,468 @@ 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x61, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x77, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x79, 0x00, 0x6d, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x61, 0x01, 0x42, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x72, 0x00, 0x77, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x79, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x7a, 0x00, 0x79, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, 0xc2, 0xdc, + 0xd5, 0xd8, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x01, 0x00, 0x2c, 0x00, 0x20, 0xb1, 0x79, + 0x00, 0x20, 0xcc, 0x44, 0xb1, 0x10, 0xc7, 0x44, + 0x00, 0x20, 0xc1, 0x1c, 0xb8, 0x5c, 0x00, 0x20, + 0xb3, 0xc4, 0xce, 0x58, 0xd5, 0x58, 0xba, 0x70, + 0x00, 0x2c, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x44, 0x00, 0x20, + 0xc6, 0x2c, 0xbc, 0x14, 0xb8, 0x5c, 0x00, 0x20, + 0xc8, 0x01, 0xc6, 0xa9, 0xd5, 0x88, 0xb2, 0x94, + 0xc9, 0xc0, 0x00, 0x20, 0xb2, 0x08, 0xc7, 0x3c, + 0xb8, 0x5c, 0x00, 0x20, 0xd6, 0x55, 0xc7, 0x78, + 0xd5, 0x60, 0x00, 0x20, 0xb5, 0x4c, 0x00, 0x20, + 0xc7, 0x20, 0xc6, 0xa9, 0xd5, 0x69, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, 0xc7, 0x74, + 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, + 0xc7, 0x7c, 0xc7, 0x44, 0x00, 0x20, 0xb4, 0x50, + 0xbc, 0x88, 0x00, 0x20, 0xc8, 0x01, 0xc6, 0xa9, + 0xd5, 0x58, 0xba, 0x74, 0x00, 0x20, 0xc7, 0x74, + 0xbb, 0xf8, 0xc9, 0xc0, 0x00, 0x20, 0xd6, 0x15, + 0xd0, 0xdc, 0xb2, 0x94, 0x00, 0x20, 0xc6, 0xd0, + 0x00, 0x20, 0xc0, 0xc1, 0xd0, 0xdc, 0xb8, 0x5c, + 0x00, 0x20, 0xbc, 0xf4, 0xc7, 0x85, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x77, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, + 0x00, 0x6d, 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, 0x01, 0x42, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x77, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x7a, 0x00, 0x69, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x79, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x61, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x75, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x7a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x77, + 0x00, 0x79, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x4a, 0x00, 0x65, 0x01, 0x5b, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x01, 0x42, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x77, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, + 0x00, 0x79, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, 0x00, 0x67, + 0x00, 0x6c, 0x01, 0x05, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x7a, + 0x00, 0x6d, 0x00, 0x69, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x75, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x77, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x67, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x6f, 0x00, 0x77, 0x00, 0x79, 0x00, 0x77, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0xf3, - 0x00, 0x77, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x4a, - 0x00, 0x65, 0x01, 0x5b, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x01, 0x42, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x77, 0x00, 0x61, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x7a, 0x00, 0x79, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x79, 0x00, 0x67, 0x00, 0x6c, 0x01, 0x05, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x7a, 0x00, 0x6d, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, - 0x00, 0xe9, 0x00, 0x20, 0x00, 0xfa, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x75, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe3, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x53, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x70, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x7a, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0xfa, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x65, 0x00, 0x72, - 0x00, 0xe1, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x2e, 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x38, 0x04, 0x42, 0x00, 0x20, 0x04, 0x37, - 0x04, 0x30, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x41, 0x04, 0x3d, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x35, 0x04, 0x3b, - 0x04, 0x51, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x3e, - 0x04, 0x32, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x35, - 0x04, 0x37, 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, - 0x04, 0x32, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x47, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x32, 0x04, 0x35, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x37, 0x04, 0x43, 0x04, 0x30, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3d, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3d, - 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x3c, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x39, - 0x00, 0x2e, 0x00, 0x20, 0x04, 0x15, 0x04, 0x41, - 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, 0x00, 0x75, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x61, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x53, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x75, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x65, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, + 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x51, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x36, 0x04, 0x34, - 0x04, 0x4b, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x35, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x4b, 0x04, 0x33, 0x04, 0x3b, 0x04, 0x4f, - 0x04, 0x34, 0x04, 0x38, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x35, 0x04, 0x38, 0x04, 0x37, - 0x04, 0x3c, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x3c, 0x00, 0x2e, 0x00, 0x00, - 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x37, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x5a, - 0x04, 0x43, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x46, 0x04, 0x40, 0x04, 0x32, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x35, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x3e, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x38, 0x04, 0x42, + 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x04, 0x3c, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x40, 0x04, 0x30, 0x04, 0x41, + 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x35, 0x04, 0x3b, 0x04, 0x51, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x30, - 0x04, 0x3b, 0x04, 0x35, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, - 0x04, 0x3d, 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x34, - 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x35, - 0x04, 0x40, 0x04, 0x30, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x41, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, 0x04, 0x3d, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x5a, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x10, 0x04, 0x3a, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, + 0x04, 0x3b, 0x04, 0x3e, 0x04, 0x32, 0x00, 0x20, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x35, 0x04, 0x37, 0x04, 0x35, + 0x04, 0x3d, 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x37, + 0x04, 0x43, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3d, + 0x04, 0x42, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x35, 0x04, 0x39, 0x00, 0x2e, 0x00, 0x20, + 0x04, 0x15, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, 0x04, 0x3c, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x51, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x36, 0x04, 0x34, 0x04, 0x4b, 0x00, 0x2c, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x3e, + 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x4b, 0x04, 0x33, + 0x04, 0x3b, 0x04, 0x4f, 0x04, 0x34, 0x04, 0x38, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, + 0x04, 0x38, 0x04, 0x37, 0x04, 0x3c, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x3c, + 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, 0x04, 0x3c, + 0x04, 0x35, 0x04, 0x5a, 0x04, 0x43, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x46, 0x04, 0x40, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x35, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, + 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x34, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x43, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x32, 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x5a, 0x04, 0x35, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x32, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x43, 0x04, 0x42, - 0x04, 0x30, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x33, - 0x04, 0x3b, 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x5a, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x72, - 0x00, 0xf6, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x67, 0x00, 0x72, 0x00, 0xf6, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x67, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, 0x00, 0x75, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0xe4, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6b, - 0x00, 0x74, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x4f, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0xe4, - 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x76, 0x00, 0xe5, - 0x00, 0x20, 0x00, 0x67, 0x00, 0xe5, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x42, 0x00, 0x75, + 0x04, 0x38, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x10, + 0x04, 0x3a, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x5a, + 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x32, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x43, 0x04, 0x42, 0x04, 0x30, 0x00, 0x2c, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x3a, 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x33, 0x04, 0x3b, 0x04, 0x35, + 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x35, 0x04, 0x38, 0x04, 0x37, 0x04, 0x3c, + 0x04, 0x35, 0x04, 0x5a, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x30, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6b, - 0x01, 0x31, 0x00, 0x72, 0x00, 0x6d, 0x01, 0x31, - 0x00, 0x7a, 0x01, 0x31, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x79, 0x00, 0x65, - 0x01, 0x5f, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x79, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x72, 0x00, 0xf6, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x67, 0x00, 0x72, + 0x00, 0xf6, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, - 0x01, 0x31, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, - 0x01, 0x1f, 0x00, 0x72, 0x00, 0x75, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x79, 0x00, 0x67, 0x00, 0x75, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6d, - 0x01, 0x31, 0x01, 0x5f, 0x00, 0x20, 0x00, 0x6d, - 0x01, 0x31, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x79, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0xe4, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x62, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x75, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, 0x00, 0x79, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, 0x01, 0x31, - 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x45, - 0x01, 0x1f, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x75, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6b, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x66, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, 0x01, 0x31, - 0x00, 0x72, 0x00, 0x73, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, 0x00, 0xfc, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0xfc, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x01, 0x1f, 0x00, 0x69, - 0x01, 0x5f, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6d, - 0x00, 0x69, 0x01, 0x5f, 0x00, 0x20, 0x00, 0x67, - 0x00, 0xf6, 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, - 0x00, 0xfc, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, - 0x04, 0x23, 0x00, 0x20, 0x04, 0x46, 0x04, 0x4c, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0xe4, 0x00, 0x6d, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x74, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x4f, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0xe4, 0x00, 0x6d, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x76, 0x00, 0xe5, 0x00, 0x20, 0x00, 0x67, + 0x00, 0xe5, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x66, 0x00, 0xf6, + 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x42, 0x00, 0x75, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x6b, 0x01, 0x31, 0x00, 0x72, + 0x00, 0x6d, 0x01, 0x31, 0x00, 0x7a, 0x01, 0x31, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x79, 0x00, 0x65, 0x01, 0x5f, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x72, 0x01, 0x31, 0x00, 0x6e, + 0x01, 0x31, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x6f, 0x01, 0x1f, 0x00, 0x72, + 0x00, 0x75, 0x00, 0x20, 0x00, 0x75, 0x00, 0x79, + 0x00, 0x67, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x6d, 0x01, 0x31, 0x01, 0x5f, + 0x00, 0x20, 0x00, 0x6d, 0x01, 0x31, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x79, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x61, 0x00, 0x79, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, + 0x00, 0x6c, 0x01, 0x31, 0x00, 0x72, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x45, 0x01, 0x1f, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, + 0x00, 0x6c, 0x01, 0x31, 0x00, 0x72, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, + 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0xfc, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x01, 0x1f, 0x00, 0x69, 0x01, 0x5f, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6d, 0x00, 0x69, 0x01, 0x5f, + 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, + 0x00, 0xfc, 0x00, 0x6e, 0x00, 0xfc, 0x00, 0x72, + 0x00, 0x2e, 0x00, 0x00, 0x04, 0x23, 0x00, 0x20, + 0x04, 0x46, 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x3c, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x42, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3c, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, - 0x04, 0x56, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x31, 0x04, 0x3c, 0x04, 0x56, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x56, 0x04, 0x41, - 0x04, 0x46, 0x04, 0x4f, 0x04, 0x3c, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x30, 0x04, 0x3b, 0x04, 0x56, 0x04, 0x32, - 0x00, 0x20, 0x04, 0x47, 0x04, 0x35, 0x04, 0x40, - 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x56, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x35, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x56, 0x04, 0x32, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x26, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x2c, - 0x00, 0x20, 0x04, 0x49, 0x04, 0x3e, 0x04, 0x31, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x35, 0x04, 0x40, - 0x04, 0x35, 0x04, 0x32, 0x04, 0x56, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x32, 0x04, 0x56, - 0x04, 0x37, 0x04, 0x43, 0x04, 0x30, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x3c, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, - 0x04, 0x36, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x56, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x47, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x36, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x3c, 0x00, 0x20, 0x04, 0x47, 0x04, 0x38, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x3c, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x30, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x56, 0x04, 0x3b, 0x04, 0x56, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x2f, 0x04, 0x3a, 0x04, 0x49, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, + 0x04, 0x56, 0x04, 0x3b, 0x04, 0x56, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3c, + 0x04, 0x56, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x56, 0x04, 0x41, 0x04, 0x46, 0x04, 0x4f, + 0x04, 0x3c, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, + 0x04, 0x56, 0x04, 0x32, 0x00, 0x20, 0x04, 0x47, + 0x04, 0x35, 0x04, 0x40, 0x04, 0x32, 0x04, 0x3e, + 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x56, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x35, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, 0x04, 0x32, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x26, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x3d, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, + 0x04, 0x3e, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x49, + 0x04, 0x3e, 0x04, 0x31, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x35, 0x04, 0x40, 0x04, 0x35, 0x04, 0x32, + 0x04, 0x56, 0x04, 0x40, 0x04, 0x38, 0x04, 0x42, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x56, 0x04, 0x37, 0x04, 0x43, + 0x04, 0x30, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x40, 0x04, 0x35, 0x04, 0x36, 0x04, 0x38, + 0x04, 0x3c, 0x04, 0x56, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x47, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x36, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x3c, 0x00, 0x20, + 0x04, 0x47, 0x04, 0x38, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x3c, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x46, 0x04, 0x35, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x34, 0x04, 0x32, - 0x04, 0x56, 0x04, 0x47, 0x04, 0x56, 0x00, 0x2c, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x30, 0x04, 0x31, 0x04, 0x43, - 0x04, 0x34, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x47, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x33, 0x04, 0x3b, 0x04, 0x4f, - 0x04, 0x34, 0x04, 0x43, 0x00, 0x2e, 0x00, 0x00, - 0x6b, 0x64, 0x6e, 0x2c, 0x8a, 0x66, 0x75, 0x28, - 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x03, - 0x4e, 0xa4, 0x63, 0xdb, 0x7d, 0x05, 0x82, 0x72, - 0x82, 0x07, 0x7d, 0xa0, 0x82, 0x72, 0x90, 0x1a, - 0x90, 0x53, 0xff, 0x0c, 0x66, 0x2f, 0x6a, 0xa2, - 0x9a, 0x57, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, - 0x66, 0x2f, 0x54, 0x26, 0x5d, 0xf2, 0x6b, 0x63, - 0x78, 0xba, 0x59, 0x57, 0x75, 0x28, 0x76, 0x84, - 0x67, 0x09, 0x75, 0x28, 0x89, 0x96, 0x89, 0xba, - 0x6c, 0xd5, 0x30, 0x02, 0x82, 0xe5, 0x6b, 0x64, - 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x59, 0x57, - 0x75, 0x28, 0x51, 0x69, 0x6b, 0x21, 0xff, 0x0c, - 0x52, 0x47, 0x5f, 0x71, 0x50, 0xcf, 0x59, 0x16, - 0x89, 0xc0, 0x71, 0x21, 0x8b, 0x8a, 0x53, 0x16, - 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x50, 0x72, 0x6f, 0x50, - 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x47, 0x42, 0x2e, - 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xec, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x32, 0xec, 0x6c, 0x63, 0x6d, 0x73, + 0x04, 0x56, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x2f, + 0x04, 0x3a, 0x04, 0x49, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x37, 0x04, 0x30, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x43, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x46, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x32, 0x04, 0x56, 0x04, 0x47, + 0x04, 0x56, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3d, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, + 0x04, 0x31, 0x04, 0x43, 0x04, 0x34, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x47, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x33, + 0x04, 0x3b, 0x04, 0x4f, 0x04, 0x34, 0x04, 0x43, + 0x00, 0x2e, 0x00, 0x00, 0x6b, 0x64, 0x6e, 0x2c, + 0x8a, 0x66, 0x75, 0x28, 0x63, 0xcf, 0x8f, 0xf0, + 0x6a, 0x94, 0x67, 0x03, 0x4e, 0xa4, 0x63, 0xdb, + 0x7d, 0x05, 0x82, 0x72, 0x82, 0x07, 0x7d, 0xa0, + 0x82, 0x72, 0x90, 0x1a, 0x90, 0x53, 0xff, 0x0c, + 0x66, 0x2f, 0x6a, 0xa2, 0x9a, 0x57, 0x63, 0xcf, + 0x8f, 0xf0, 0x6a, 0x94, 0x66, 0x2f, 0x54, 0x26, + 0x5d, 0xf2, 0x6b, 0x63, 0x78, 0xba, 0x59, 0x57, + 0x75, 0x28, 0x76, 0x84, 0x67, 0x09, 0x75, 0x28, + 0x89, 0x96, 0x89, 0xba, 0x6c, 0xd5, 0x30, 0x02, + 0x82, 0xe5, 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, + 0x6a, 0x94, 0x59, 0x57, 0x75, 0x28, 0x51, 0x69, + 0x6b, 0x21, 0xff, 0x0c, 0x52, 0x47, 0x5f, 0x71, + 0x50, 0xcf, 0x59, 0x16, 0x89, 0xc0, 0x71, 0x21, + 0x8b, 0x8a, 0x53, 0x16, 0x30, 0x02, 0x00, 0x00, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x5c, 0x06, 0x7e, 0xa2, 0x7e, 0xff, + 0x90, 0x1a, 0x90, 0x53, 0x4e, 0x92, 0x63, 0x62, + 0xff, 0x0c, 0x57, 0x28, 0x68, 0xc0, 0x67, 0xe5, + 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, + 0x66, 0x2f, 0x54, 0x26, 0x6b, 0x63, 0x78, 0x6e, + 0x5e, 0x94, 0x75, 0x28, 0x65, 0xf6, 0x97, 0x5e, + 0x5e, 0x38, 0x67, 0x09, 0x75, 0x28, 0x30, 0x02, + 0x59, 0x82, 0x67, 0x9c, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x5e, 0x94, + 0x75, 0x28, 0x4e, 0x86, 0x4e, 0x24, 0x6b, 0x21, + 0xff, 0x0c, 0x90, 0xa3, 0x4e, 0x48, 0x56, 0xfe, + 0x50, 0xcf, 0x59, 0x16, 0x89, 0xc2, 0x4e, 0x0d, + 0x4f, 0x1a, 0x53, 0xd1, 0x75, 0x1f, 0x53, 0xd8, + 0x53, 0x16, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x50, 0x72, 0x6f, 0x50, 0x68, 0x6f, 0x74, 0x6f, + 0x52, 0x47, 0x42, 0x2e, 0x69, 0x63, 0x63, 0x00, + 0xc0, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0xc0, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x34, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1e, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0x52, 0x77, 0x87, 0xc7, - 0x80, 0xac, 0x83, 0x07, 0x77, 0x32, 0xda, 0x82, - 0xf0, 0x55, 0x7c, 0x37, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0xbd, 0xc4, 0x76, 0x6a, + 0x49, 0xb2, 0x0f, 0xfc, 0x4f, 0xfb, 0xd3, 0xdc, + 0x91, 0x95, 0xd7, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x36, 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x58, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0a, 0x6c, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0a, 0x80, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0c, 0xdc, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0xf0, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xac, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0a, 0xc0, + 0x00, 0x00, 0x0d, 0x1c, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0d, 0x30, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xd4, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe8, + 0x00, 0x00, 0x0d, 0x44, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x58, 0x00, 0x00, 0x00, 0x10, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0a, 0xe8, 0x00, 0x00, 0x00, 0x10, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe8, + 0x00, 0x00, 0x0d, 0x58, 0x00, 0x00, 0x00, 0x10, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x58, 0x00, 0x00, 0x00, 0x10, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0a, 0xf8, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0b, 0x1c, - 0x00, 0x00, 0x01, 0x98, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x0c, 0xb4, 0x00, 0x00, 0x26, 0x36, + 0x00, 0x00, 0x0d, 0x68, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0d, 0x8c, + 0x00, 0x00, 0x01, 0x96, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x0f, 0x24, 0x00, 0x00, 0x27, 0x9a, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x1a, @@ -6183,34 +6800,43 @@ 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x6a, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x52, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x01, 0xcc, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0x48, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, - 0x00, 0x00, 0x02, 0xf8, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x76, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x9a, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x02, 0x14, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x02, 0x82, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x02, 0xfe, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xae, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x03, 0xe6, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x04, 0x5a, + 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0xd2, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x05, 0xfa, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x06, 0x28, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0x5c, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x05, 0x80, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x05, 0xf4, + 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x06, 0x7a, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x07, 0x02, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x07, 0x7c, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0xee, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x08, 0x7e, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x08, 0xf8, + 0x00, 0x00, 0x08, 0x56, 0x73, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x08, 0xde, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x09, 0x52, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x09, 0xcc, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x0a, 0x3e, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x0a, 0xce, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x0b, 0x48, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -6239,59 +6865,87 @@ 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, - 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, - 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x72, 0x00, 0xe6, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, + 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, + 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, + 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, - 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0xed, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0xf1, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, @@ -6342,70 +6996,107 @@ 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, 0x30, 0x59, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x00, 0xc7, 0x91, 0xad, 0x8c, 0x00, 0x20, + 0xc8, 0x1c, 0xd5, 0x5c, 0xc7, 0x3c, 0xb8, 0x5c, + 0xbd, 0x80, 0xd1, 0x30, 0x00, 0x20, 0xc7, 0x90, + 0xc7, 0x20, 0xb8, 0x6d, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x01, 0x7e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xfd, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, @@ -6472,7 +7163,11 @@ 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, - 0x52, 0x36, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, + 0x52, 0x36, 0x00, 0x00, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x51, 0x4d, + 0x4e, 0x8e, 0x5d, 0xf2, 0x77, 0xe5, 0x76, 0x84, + 0x72, 0x48, 0x67, 0x43, 0x96, 0x50, 0x52, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, 0x00, 0x00, 0x00, 0x00, @@ -6498,472 +7193,147 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x96, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa2, - 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xca, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd2, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe8, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf4, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x08, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x2a, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x46, - 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x01, 0x5e, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x6c, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x72, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x88, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xc8, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd0, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe6, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf2, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x06, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x28, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x44, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x01, 0x5c, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x6a, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x70, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x86, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x47, - 0x00, 0x41, 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, - 0x00, 0x5f, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x29, 0x00, 0x34, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, - 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x47, 0x00, 0x41, + 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, 0x00, 0x5f, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x29, 0x00, 0x34, 0x00, 0x2e, + 0x00, 0x31, 0x00, 0x34, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, + 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, + 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, + 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x02, 0x5a, 0x00, 0x00, 0x00, 0xc4, + 0x00, 0x00, 0x02, 0x5a, 0x00, 0x00, 0x00, 0xd0, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0x4e, - 0x00, 0x00, 0x03, 0x1e, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x02, 0xba, 0x00, 0x00, 0x05, 0x6c, + 0x00, 0x00, 0x03, 0x2a, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x02, 0xba, 0x00, 0x00, 0x05, 0x78, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x02, 0xce, - 0x00, 0x00, 0x08, 0x26, 0x65, 0x6e, 0x47, 0x42, - 0x00, 0x00, 0x02, 0x5e, 0x00, 0x00, 0x0a, 0xf4, + 0x00, 0x00, 0x08, 0x32, 0x65, 0x6e, 0x47, 0x42, + 0x00, 0x00, 0x02, 0x5e, 0x00, 0x00, 0x0b, 0x00, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0x92, - 0x00, 0x00, 0x0d, 0x52, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x02, 0xba, 0x00, 0x00, 0x0f, 0xe4, - 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x02, 0x82, - 0x00, 0x00, 0x12, 0x9e, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x02, 0xc0, 0x00, 0x00, 0x15, 0x20, - 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x02, 0xe2, - 0x00, 0x00, 0x17, 0xe0, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x1a, 0xc2, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x02, 0x5c, - 0x00, 0x00, 0x1d, 0x02, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x9e, 0x00, 0x00, 0x1f, 0x5e, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x03, 0x4a, - 0x00, 0x00, 0x21, 0xfc, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x25, 0x46, - 0x00, 0x4f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x79, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x45, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x79, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x70, 0x00, 0x68, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x41, 0x00, 0x57, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x55, - 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x79, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x68, 0x00, 0x20, 0x00, 0x31, - 0x00, 0x36, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x79, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x73, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x50, 0x01, 0x6f, 0x00, 0x76, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6e, 0x01, 0x1b, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x76, - 0x00, 0x72, 0x01, 0x7e, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x65, 0x01, 0x0d, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, 0x00, 0xed, + 0x00, 0x00, 0x0d, 0x5e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x02, 0xba, 0x00, 0x00, 0x0f, 0xf0, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x58, + 0x00, 0x00, 0x12, 0xaa, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x82, 0x00, 0x00, 0x14, 0x02, + 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x02, 0xc0, + 0x00, 0x00, 0x16, 0x84, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x02, 0xe2, 0x00, 0x00, 0x19, 0x44, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, + 0x00, 0x00, 0x1c, 0x26, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x5c, 0x00, 0x00, 0x1e, 0x66, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x02, 0x9e, + 0x00, 0x00, 0x20, 0xc2, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x4a, 0x00, 0x00, 0x23, 0x60, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0xf0, + 0x00, 0x00, 0x26, 0xaa, 0x00, 0x4f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x7a, - 0x00, 0x76, 0x00, 0x61, 0x00, 0x6e, 0x00, 0xfd, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, - 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x6d, 0x00, 0x6f, 0x01, 0x7e, - 0x01, 0x48, 0x00, 0x75, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6b, - 0x00, 0xfd, 0x00, 0x20, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x7a, 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x76, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x75, 0x01, 0x7e, - 0x00, 0xed, 0x00, 0x76, 0x00, 0xe1, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x6f, - 0x00, 0x68, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x66, 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x76, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x62, - 0x00, 0x75, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x69, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x6e, 0x00, 0xed, 0x00, 0x6d, 0x00, 0x6b, - 0x01, 0x6f, 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, - 0x00, 0x57, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x6f, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x70, 0x00, 0x6f, - 0x00, 0x75, 0x01, 0x7e, 0x00, 0xed, 0x00, 0x76, - 0x00, 0xe1, 0x00, 0x20, 0x00, 0x68, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x62, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6f, - 0x01, 0x48, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, - 0x01, 0x6f, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0xe1, 0x00, 0x6c, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x6d, 0x01, 0x6f, 0x01, 0x7e, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x01, 0x59, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, - 0x00, 0xe1, 0x00, 0x6e, 0x00, 0xed, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6e, 0x00, 0xed, 0x00, 0x6d, - 0x00, 0x6b, 0x01, 0x6f, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x6a, 0x00, 0xed, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x69, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x55, 0x00, 0x72, 0x00, 0x73, 0x00, 0x70, - 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x77, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x66, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x68, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x6f, 0x00, 0xdf, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x46, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x62, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x46, 0x00, 0x6f, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x66, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x44, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x42, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x72, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, 0x00, 0x75, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x41, 0x00, 0x57, 0x00, 0x2d, 0x00, 0x42, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x7a, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x57, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x20, 0x00, 0x31, - 0x00, 0x36, 0x00, 0x20, 0x00, 0x42, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x47, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x75, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x69, 0x00, 0x72, 0x00, 0x64, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x75, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x46, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x62, 0x00, 0x62, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x42, 0x00, 0x65, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x42, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x2e, - 0x00, 0x00, 0x03, 0x91, 0x03, 0xc1, 0x03, 0xc7, - 0x03, 0xb9, 0x03, 0xba, 0x03, 0xac, 0x00, 0x20, - 0x03, 0xc3, 0x03, 0xc7, 0x03, 0xb5, 0x03, 0xb4, - 0x03, 0xb9, 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, - 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, - 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x6b, 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb5, - 0x00, 0x20, 0x03, 0xbf, 0x03, 0xbd, 0x03, 0xbf, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xaf, - 0x03, 0xb1, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, - 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, - 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, - 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc5, - 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xbc, - 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb5, - 0x03, 0xaf, 0x00, 0x20, 0x03, 0xbd, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xbc, 0x03, 0xc6, - 0x03, 0xb1, 0x03, 0xbd, 0x03, 0xaf, 0x03, 0xc3, - 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xbc, - 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xbf, 0x03, 0xbb, 0x03, 0xcd, 0x00, 0x20, - 0x03, 0xbc, 0x03, 0xb5, 0x03, 0xb3, 0x03, 0xac, - 0x03, 0xbb, 0x03, 0xb7, 0x00, 0x20, 0x03, 0xb3, - 0x03, 0xba, 0x03, 0xac, 0x03, 0xbc, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xc9, - 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, - 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb9, - 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xc4, 0x03, 0xb1, - 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, - 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbf, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xbf, 0x03, 0xcd, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc6, 0x03, 0xc9, - 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xb3, 0x03, 0xc1, - 0x03, 0xac, 0x03, 0xc6, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xb9, - 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, - 0x03, 0xcc, 0x03, 0xb4, 0x03, 0xbf, 0x03, 0xc3, - 0x03, 0xb7, 0x00, 0x2c, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xbe, 0x03, 0xb5, - 0x03, 0xc1, 0x03, 0xb3, 0x03, 0xb1, 0x03, 0xc3, - 0x03, 0xaf, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xba, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc1, 0x03, 0xc7, 0x03, 0xb5, 0x03, 0xb9, - 0x03, 0xbf, 0x03, 0xb8, 0x03, 0xad, 0x03, 0xc4, - 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb7, 0x00, 0x20, - 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xcc, - 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, 0x00, 0x2e, - 0x00, 0x20, 0x03, 0x9c, 0x03, 0xc0, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xc4, - 0x03, 0xb5, 0x00, 0x20, 0x03, 0xbd, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb5, 0x03, 0xaf, - 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc7, - 0x03, 0xc1, 0x03, 0xce, 0x03, 0xbc, 0x03, 0xb1, - 0x03, 0xc4, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc3, - 0x03, 0xba, 0x03, 0xaf, 0x03, 0xb1, 0x03, 0xc3, - 0x03, 0xb7, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xba, - 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xac, 0x00, 0x20, - 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb5, 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xbe, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb3, 0x03, 0xb1, - 0x03, 0xc3, 0x03, 0xaf, 0x03, 0xb1, 0x00, 0x20, - 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xcc, - 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x2c, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xba, 0x03, 0xc4, - 0x03, 0xcc, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xba, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xc1, - 0x03, 0xb3, 0x03, 0xac, 0x03, 0xb6, 0x03, 0xb5, - 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, - 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xba, 0x03, 0xc1, 0x03, 0xaf, 0x03, 0xb2, - 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x73, 0x00, 0x20, - 0x03, 0xb1, 0x03, 0xbd, 0x03, 0xac, 0x00, 0x20, - 0x03, 0xba, 0x03, 0xb1, 0x03, 0xbd, 0x03, 0xac, - 0x03, 0xbb, 0x03, 0xb9, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x4f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x79, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x45, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x79, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x70, 0x00, 0x68, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, + 0x00, 0x74, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x67, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x73, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x55, 0x00, 0x6e, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x79, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x55, 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x20, 0x00, 0x79, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6b, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x79, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x79, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x77, 0x00, 0x69, 0x00, 0x74, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x73, 0x00, 0x69, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x79, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x77, 0x00, 0x68, @@ -6971,1012 +7341,1381 @@ 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x4f, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x65, 0x00, 0xf1, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, - 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x75, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x75, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6d, - 0x00, 0x70, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x79, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x75, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x74, 0x00, 0xf3, 0x00, 0x67, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x76, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0xe1, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, - 0x00, 0x57, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x71, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0xe9, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x62, - 0x00, 0x61, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x69, 0x00, 0xf3, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x62, 0x00, 0x65, 0x00, 0x72, - 0x00, 0xed, 0x00, 0x61, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x75, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0xe1, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x4f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x50, + 0x01, 0x6f, 0x00, 0x76, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x6e, 0x01, 0x1b, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x72, 0x01, 0x7e, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x65, + 0x01, 0x0d, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x74, 0x00, 0xed, 0x00, 0x20, 0x00, 0x45, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x7a, 0x00, 0x76, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0xfd, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x75, 0x00, 0xf2, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, 0x00, 0x75, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, - 0x00, 0x7a, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x20, 0x00, 0xe8, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6d, + 0x00, 0x6f, 0x01, 0x7e, 0x01, 0x48, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x7a, 0x00, 0x69, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6d, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x7a, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x68, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x76, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x75, 0x01, 0x7e, 0x00, 0xed, 0x00, 0x76, + 0x00, 0xe1, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x68, 0x00, 0xfd, + 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x27, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x76, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, - 0x00, 0x57, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x76, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x76, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x62, 0x00, 0x75, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, + 0x00, 0x76, 0x00, 0x61, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x6e, 0x00, 0xed, + 0x00, 0x6d, 0x00, 0x6b, 0x01, 0x6f, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x50, 0x00, 0x6f, 0x00, 0x6b, + 0x00, 0x75, 0x00, 0x64, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x70, 0x00, 0x6f, 0x00, 0x75, 0x01, 0x7e, + 0x00, 0xed, 0x00, 0x76, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x68, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x62, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x6f, 0x01, 0x48, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x74, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x62, 0x00, 0x62, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6d, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x4f, 0x00, 0x72, 0x00, 0x79, - 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x77, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, - 0x00, 0x7a, 0x00, 0x20, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x6d, 0x01, 0x19, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x74, 0x01, 0x6f, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0xe1, 0x00, 0x6c, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6d, 0x01, 0x6f, + 0x01, 0x7e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x01, 0x59, 0x00, 0x69, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x76, 0x00, 0xe1, 0x00, 0x6e, + 0x00, 0xed, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6e, + 0x00, 0xed, 0x00, 0x6d, 0x00, 0x6b, 0x01, 0x6f, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x6a, + 0x00, 0xed, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x7a, 0x00, 0x61, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x55, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x70, 0x00, 0x72, 0x00, 0xfc, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x77, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x6b, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x77, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x77, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x66, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x01, 0x7c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, - 0x01, 0x5b, 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x6c, 0x00, 0x61, 0x01, 0x07, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x7a, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6b, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, 0x00, 0x75, - 0x01, 0x7c, 0x00, 0x79, 0x00, 0x77, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x6b, 0x00, 0x74, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x68, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0xdf, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x46, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x62, 0x00, 0x62, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x62, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x69, 0x00, 0x72, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x46, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x20, 0x00, 0x44, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x42, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, + 0x00, 0x2d, 0x00, 0x42, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x57, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, + 0x00, 0x42, 0x00, 0x69, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x47, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x69, 0x00, 0x67, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x4b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x75, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x46, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x62, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x42, + 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x42, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x2e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc1, 0x03, 0xc7, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xac, 0x00, 0x20, 0x03, 0xc3, 0x03, 0xc7, + 0x03, 0xb5, 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xb1, + 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, + 0x03, 0xbd, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, + 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xbf, + 0x03, 0xbd, 0x03, 0xbf, 0x03, 0xbc, 0x03, 0xb1, + 0x03, 0xc3, 0x03, 0xaf, 0x03, 0xb1, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x2c, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, + 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, + 0x00, 0x20, 0x03, 0xbc, 0x03, 0xc0, 0x03, 0xbf, + 0x03, 0xc1, 0x03, 0xb5, 0x03, 0xaf, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xb5, + 0x03, 0xbc, 0x03, 0xc6, 0x03, 0xb1, 0x03, 0xbd, + 0x03, 0xaf, 0x03, 0xc3, 0x03, 0xb5, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb9, 0x03, 0xb1, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xbb, + 0x03, 0xcd, 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb5, + 0x03, 0xb3, 0x03, 0xac, 0x03, 0xbb, 0x03, 0xb7, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xba, 0x03, 0xac, + 0x03, 0xbc, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, + 0x03, 0xc1, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, + 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x20, + 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xb7, 0x03, 0xc3, + 0x03, 0xb9, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xc0, + 0x03, 0xbf, 0x03, 0xb9, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xbb, 0x03, 0xbb, + 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xc6, 0x03, 0xc9, 0x03, 0xc4, 0x03, 0xbf, + 0x03, 0xb3, 0x03, 0xc1, 0x03, 0xac, 0x03, 0xc6, + 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xb3, 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x03, 0xb4, + 0x03, 0xbf, 0x03, 0xc3, 0x03, 0xb7, 0x00, 0x2c, + 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbd, + 0x00, 0x20, 0x03, 0xb5, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xbe, 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb3, + 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xaf, 0x03, 0xb1, + 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc1, 0x03, 0xc7, + 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xb8, + 0x03, 0xad, 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xc3, + 0x03, 0xb7, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xb9, + 0x03, 0xba, 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xbd, 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, + 0x00, 0x57, 0x00, 0x2e, 0x00, 0x20, 0x03, 0x9c, + 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb5, + 0x03, 0xaf, 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xc4, 0x03, 0xb5, + 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xce, + 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, + 0x00, 0x20, 0x03, 0xc3, 0x03, 0xba, 0x03, 0xaf, + 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xb7, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xc4, + 0x03, 0xac, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, + 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xc0, + 0x03, 0xb5, 0x03, 0xbe, 0x03, 0xb5, 0x03, 0xc1, + 0x03, 0xb3, 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xaf, + 0x03, 0xb1, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xb9, + 0x03, 0xba, 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xbd, 0x00, 0x2c, 0x00, 0x20, 0x03, 0xb5, + 0x03, 0xba, 0x03, 0xc4, 0x03, 0xcc, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x00, 0x20, 0x03, 0xb1, 0x03, 0xbd, 0x00, 0x20, + 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb3, 0x03, 0xac, + 0x03, 0xb6, 0x03, 0xb5, 0x03, 0xc3, 0x03, 0xc4, + 0x03, 0xb5, 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb5, + 0x00, 0x20, 0x03, 0xb1, 0x03, 0xba, 0x03, 0xc1, + 0x03, 0xaf, 0x03, 0xb2, 0x03, 0xb5, 0x03, 0xb9, + 0x03, 0xb1, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xbd, + 0x03, 0xac, 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, + 0x03, 0xbd, 0x03, 0xac, 0x03, 0xbb, 0x03, 0xb9, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, + 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x7a, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x00, 0xf3, - 0x00, 0x77, 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x68, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x79, 0x00, 0x63, 0x00, 0x6a, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x77, 0x00, 0x69, 0x00, 0x7a, - 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, - 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x41, 0x00, 0x57, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x50, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x63, - 0x00, 0x7a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x79, 0x00, 0x63, - 0x00, 0x6a, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, - 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x6f, 0x01, 0x7c, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x79, 0x00, 0x73, 0x00, 0x74, - 0x01, 0x05, 0x00, 0x70, 0x00, 0x69, 0x01, 0x07, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, 0x01, 0x5b, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x6a, 0x01, 0x05, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x36, 0x00, 0x2d, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x77, - 0x00, 0x65, 0x00, 0x6a, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, 0x00, 0x79, - 0x00, 0x7a, 0x00, 0x6a, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, 0x01, 0x42, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x50, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x67, 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, + 0x00, 0x57, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x55, 0x00, 0x6e, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x79, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x6b, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x79, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x73, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x4f, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x65, 0x00, 0xf1, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x45, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x6b, 0x00, 0x20, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x78, 0x00, 0x69, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6d, - 0x00, 0x70, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x61, 0x00, 0x69, 0x00, 0x78, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x75, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, 0x00, 0xf3, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x7a, - 0x00, 0x61, 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x69, 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x71, 0x00, 0x75, 0x00, 0x69, - 0x00, 0x76, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x41, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, - 0x00, 0x63, 0x00, 0xea, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x73, 0x00, 0xe3, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, 0x00, 0x75, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0xea, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x72, 0x00, 0xe1, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x61, 0x00, 0x69, 0x00, 0x78, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x75, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x75, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0xf3, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x7a, 0x00, 0x61, 0x00, 0x72, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6d, 0x00, 0xe1, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0xe9, 0x00, 0x20, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x62, 0x00, 0x61, 0x00, 0x6a, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x73, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x72, 0x00, 0xed, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x75, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, - 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1f, 0x04, 0x35, - 0x04, 0x40, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3d, - 0x04, 0x30, 0x04, 0x47, 0x04, 0x30, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x42, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0xe1, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x67, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x6b, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x30, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, - 0x04, 0x39, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, - 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, - 0x04, 0x4d, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, - 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x36, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x31, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x48, 0x04, 0x3e, 0x04, 0x39, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x38, 0x04, 0x30, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x37, 0x04, 0x3e, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, 0x04, 0x35, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, 0x00, 0x20, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x37, 0x04, 0x43, 0x04, 0x35, 0x04, 0x42, - 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3c, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x38, - 0x04, 0x3c, 0x04, 0x38, 0x00, 0x20, 0x04, 0x44, - 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x44, 0x04, 0x30, - 0x04, 0x3c, 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x37, 0x04, 0x43, 0x04, 0x30, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x37, 0x04, 0x30, - 0x04, 0x46, 0x04, 0x38, 0x04, 0x38, 0x00, 0x2c, - 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, - 0x04, 0x30, 0x04, 0x3a, 0x04, 0x42, 0x04, 0x38, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x30, 0x04, 0x40, - 0x04, 0x45, 0x04, 0x38, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x46, 0x04, 0x38, 0x04, 0x44, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, - 0x00, 0x2d, 0x04, 0x3d, 0x04, 0x35, 0x04, 0x33, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x32, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x15, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x4b, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x42, - 0x04, 0x30, 0x04, 0x35, 0x04, 0x42, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x41, 0x00, 0x20, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x37, 0x04, 0x40, 0x04, 0x4f, - 0x04, 0x34, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x4c, 0x04, 0x4e, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x38, 0x04, 0x42, 0x00, 0x20, 0x04, 0x3d, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x32, 0x04, 0x4b, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, - 0x04, 0x35, 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x43, 0x04, 0x32, 0x04, 0x38, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x46, 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, - 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x4b, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, 0x04, 0x40, - 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, 0x04, 0x3a, - 0x04, 0x42, 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x39, 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1f, - 0x04, 0x40, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x38, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x33, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x3c, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x18, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3c, - 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x1a, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x30, 0x04, 0x3a, - 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3d, - 0x04, 0x30, 0x04, 0x37, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x33, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x20, 0x04, 0x1e, 0x04, 0x1c, 0x04, 0x1c, - 0x00, 0x20, 0x04, 0x20, 0x04, 0x13, 0x04, 0x11, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, - 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x36, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x32, 0x04, 0x40, - 0x04, 0x3b, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x48, - 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x3a, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x41, - 0x04, 0x35, 0x04, 0x33, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x58, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x33, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3d, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x38, 0x00, 0x20, 0x04, 0x44, - 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x44, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x46, 0x04, 0x40, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x5a, 0x04, 0x35, 0x00, 0x2c, 0x00, 0x20, - 0x04, 0x43, 0x04, 0x40, 0x04, 0x35, 0x04, 0x52, - 0x04, 0x38, 0x04, 0x32, 0x04, 0x30, 0x04, 0x5a, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x30, 0x04, 0x40, 0x04, 0x45, 0x04, 0x38, - 0x04, 0x32, 0x04, 0x38, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x5a, 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x30, - 0x00, 0x2e, 0x00, 0x20, 0x04, 0x1e, 0x04, 0x41, - 0x04, 0x38, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3d, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x34, 0x04, 0x38, 0x04, 0x42, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x47, 0x04, 0x3d, - 0x04, 0x3e, 0x04, 0x48, 0x04, 0x5b, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x34, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x38, 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, - 0x04, 0x43, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3c, - 0x04, 0x3e, 0x04, 0x36, 0x04, 0x35, 0x04, 0x42, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x34, 0x04, 0x35, 0x04, 0x42, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x34, 0x04, 0x40, - 0x04, 0x43, 0x04, 0x36, 0x04, 0x38, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x5a, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x31, 0x04, 0x3e, 0x04, 0x58, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x34, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x43, 0x04, 0x40, - 0x04, 0x35, 0x04, 0x52, 0x04, 0x43, 0x04, 0x58, - 0x04, 0x35, 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3a, - 0x04, 0x35, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, 0x00, 0xe5, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, 0x00, 0xf6, - 0x00, 0x72, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, - 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x61, - 0x00, 0x6b, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6b, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x66, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, - 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0xe5, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x66, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, - 0x00, 0x2d, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x4f, 0x00, 0x6d, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, - 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x42, 0x00, 0x61, 0x01, 0x5f, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, - 0x01, 0x31, 0x00, 0x63, 0x01, 0x31, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x45, + 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x71, + 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x75, + 0x00, 0xf2, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x75, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0xe8, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x27, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x69, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6d, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x62, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x69, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x2e, 0x00, 0x00, 0xc5, 0x60, + 0xcd, 0x08, 0xc5, 0xd0, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x66, 0x01, 0x31, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x6d, 0x01, 0x31, 0x01, 0x5f, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x01, 0x31, 0x00, 0x72, 0x01, 0x31, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x75, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0xe7, 0x00, 0x6f, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, - 0x01, 0x5f, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x20, 0x00, 0xfc, 0x00, 0x72, - 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x79, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, 0x00, 0xfc, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0xfc, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x79, 0x00, 0x65, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, - 0x00, 0xe7, 0x00, 0x6f, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, - 0x01, 0x1f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, - 0x00, 0xe7, 0x01, 0x31, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, - 0x01, 0x31, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x72, 0x00, 0xe7, 0x00, 0x65, 0x00, 0x6b, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x28, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x29, 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x6b, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x64, 0x01, 0x31, 0x00, 0x72, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x68, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x6c, 0x01, 0x31, 0x01, 0x1f, - 0x01, 0x31, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, - 0x01, 0x5f, 0x01, 0x31, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, - 0x00, 0xe7, 0x00, 0x61, 0x00, 0x6c, 0x01, 0x31, - 0x01, 0x5f, 0x01, 0x31, 0x00, 0x6c, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x64, 0x01, 0x31, 0x00, 0x6b, - 0x00, 0xe7, 0x00, 0x61, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x6d, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x64, 0x00, 0xfc, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x6b, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6b, 0x01, 0x31, 0x00, 0x6d, - 0x01, 0x31, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x7a, 0x00, 0x2e, 0x00, 0x00, - 0x04, 0x1f, 0x04, 0x35, 0x04, 0x40, 0x04, 0x48, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x32, 0x04, 0x35, - 0x04, 0x40, 0x04, 0x41, 0x04, 0x56, 0x04, 0x4e, - 0x00, 0x20, 0x04, 0x46, 0x04, 0x4c, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, - 0x04, 0x3b, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x43, 0x04, 0x3b, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x37, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3b, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x56, 0x04, 0x54, 0x04, 0x4e, + 0xc5, 0xd0, 0xc1, 0x1c, 0x00, 0x20, 0xc1, 0x24, + 0xac, 0xc4, 0xd5, 0x88, 0xac, 0xe0, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0xb7, 0x7c, 0xac, 0xe0, 0xb3, 0xc4, 0x00, 0x20, + 0xd5, 0x58, 0xb2, 0x94, 0x00, 0x20, 0xc7, 0x74, + 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, + 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, 0xc0, 0xc1, + 0xb2, 0xf9, 0xd7, 0x88, 0x00, 0x20, 0xb1, 0x13, + 0xc7, 0x40, 0x00, 0x20, 0xc6, 0x01, 0xc5, 0xed, + 0xc7, 0x58, 0x00, 0x20, 0xc0, 0xc9, 0xc0, 0xc1, + 0xc7, 0x44, 0x00, 0x20, 0xd4, 0x5c, 0xd6, 0x04, + 0xd5, 0x60, 0x00, 0x20, 0xc2, 0x18, 0x00, 0x20, + 0xc7, 0x88, 0xc7, 0x3c, 0xba, 0x70, 0x00, 0x20, + 0xb3, 0x00, 0xbd, 0x80, 0xbd, 0x84, 0xc7, 0x58, + 0x00, 0x20, 0xc0, 0xac, 0xc9, 0xc4, 0xc0, 0xac, + 0xb4, 0xe4, 0xc7, 0x74, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x41, 0x00, 0x57, 0x00, 0x20, 0xc7, 0x74, + 0xbb, 0xf8, 0xc9, 0xc0, 0xb9, 0x7c, 0x00, 0x20, + 0xd4, 0x5c, 0xd6, 0x04, 0xd5, 0x58, 0xac, 0xe0, + 0x00, 0x20, 0xd3, 0xb8, 0xc9, 0xd1, 0xd5, 0x58, + 0xac, 0xe0, 0x00, 0x20, 0xc8, 0x00, 0xc7, 0xa5, + 0xd5, 0x58, 0xb2, 0x94, 0xb3, 0x70, 0x00, 0x20, + 0xd6, 0x5c, 0xc6, 0xa9, 0xd5, 0x69, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x31, + 0x00, 0x36, 0xbe, 0x44, 0xd2, 0xb8, 0x00, 0x20, + 0xcc, 0x44, 0xb1, 0x10, 0x00, 0x20, 0xc8, 0x15, + 0xbc, 0x00, 0xb3, 0xc4, 0xb8, 0x5c, 0x00, 0x20, + 0xc7, 0x91, 0xc5, 0xc5, 0xd5, 0x58, 0xc9, 0xc0, + 0x00, 0x20, 0xc5, 0x4a, 0xb2, 0x94, 0x00, 0x20, + 0xc7, 0x74, 0xc0, 0xc1, 0x00, 0x2c, 0x00, 0x20, + 0xc7, 0x74, 0xbb, 0xf8, 0xc9, 0xc0, 0xb9, 0x7c, + 0x00, 0x20, 0xd3, 0xb8, 0xc9, 0xd1, 0xd5, 0x60, + 0x00, 0x20, 0xb5, 0x4c, 0x00, 0x20, 0xc0, 0xc9, + 0x00, 0x20, 0xb7, 0x60, 0x00, 0x20, 0xd6, 0x04, + 0xc0, 0xc1, 0xc7, 0x44, 0x00, 0x20, 0xad, 0x00, + 0xcc, 0x30, 0xd5, 0x60, 0x00, 0x20, 0xc2, 0x18, + 0x00, 0x20, 0xc7, 0x88, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x4f, + 0x00, 0x72, 0x00, 0x79, 0x00, 0x67, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x7a, 0x00, 0x65, 0x00, 0x7a, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x72, 0x00, 0x6d, + 0x01, 0x19, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x7a, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, + 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6f, 0x01, 0x7c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x79, 0x01, 0x5b, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x74, 0x00, 0x6c, + 0x00, 0x61, 0x01, 0x07, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x7a, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x6b, 0x00, 0x69, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0xf3, + 0x00, 0x77, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x75, 0x01, 0x7c, 0x00, 0x79, + 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x66, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x6a, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x77, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x7a, 0x00, 0xf3, 0x00, 0x77, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x6a, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x7a, 0x00, 0xf3, 0x00, 0x77, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x01, 0x7c, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, + 0x00, 0x73, 0x00, 0x74, 0x01, 0x05, 0x00, 0x70, + 0x00, 0x69, 0x01, 0x07, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6a, + 0x00, 0x65, 0x01, 0x5b, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x7a, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6a, + 0x01, 0x05, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x2d, 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x77, 0x00, 0x65, 0x00, 0x6a, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x79, 0x00, 0x7a, 0x00, 0x6a, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x61, 0x01, 0x42, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x6b, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x26, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x40, 0x04, 0x41, 0x04, 0x56, - 0x04, 0x4e, 0x00, 0x20, 0x04, 0x31, 0x04, 0x43, - 0x04, 0x3b, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3d, - 0x04, 0x30, 0x04, 0x37, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x17, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, - 0x04, 0x4e, 0x00, 0x20, 0x04, 0x46, 0x04, 0x4c, - 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4e, 0x00, 0x20, - 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, 0x04, 0x3d, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x32, 0x04, 0x56, - 0x04, 0x34, 0x04, 0x42, 0x04, 0x32, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x4e, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x43, 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x32, 0x04, 0x35, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x3a, 0x04, 0x43, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, - 0x04, 0x56, 0x04, 0x41, 0x04, 0x42, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, - 0x04, 0x32, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x1d, - 0x04, 0x38, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x43, 0x04, 0x4e, 0x04, 0x42, - 0x04, 0x4c, 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x31, 0x04, 0x30, 0x04, 0x33, 0x04, 0x30, - 0x04, 0x42, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x44, - 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x44, 0x04, 0x56, - 0x04, 0x32, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x30, 0x04, 0x40, - 0x04, 0x45, 0x04, 0x56, 0x04, 0x32, 0x04, 0x43, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x37, 0x04, 0x3e, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, + 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x78, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, + 0x00, 0x69, 0x00, 0x78, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0xe9, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x75, 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x74, 0x00, 0xf3, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x7a, 0x00, 0x61, 0x00, 0xe7, + 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0xe7, + 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x71, + 0x00, 0x75, 0x00, 0x69, 0x00, 0x76, 0x00, 0x61, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0xe3, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x6a, + 0x00, 0x61, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x41, 0x00, 0x57, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x6f, 0x00, 0x63, 0x00, 0xea, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x73, + 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0xea, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0xe1, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, 0x00, 0x69, + 0x00, 0x78, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x1f, 0x04, 0x35, 0x04, 0x40, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, + 0x04, 0x30, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3d, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x37, 0x04, 0x40, 0x04, 0x30, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x35, + 0x04, 0x39, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x4d, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x36, 0x04, 0x35, 0x04, 0x42, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x46, 0x04, 0x38, 0x04, 0x44, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x38, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, 0x04, 0x33, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x04, 0x32, - 0x04, 0x56, 0x04, 0x32, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x2f, 0x04, 0x3a, 0x04, 0x49, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x43, 0x04, 0x54, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x47, 0x04, 0x3d, - 0x04, 0x56, 0x04, 0x41, 0x04, 0x42, 0x04, 0x4e, - 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, 0x00, 0x31, - 0x00, 0x36, 0x00, 0x20, 0x04, 0x31, 0x04, 0x56, - 0x04, 0x42, 0x04, 0x56, 0x04, 0x32, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x43, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, 0x04, 0x56, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x46, 0x04, 0x4c, - 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4e, 0x00, 0x20, - 0x04, 0x32, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x3e, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x48, 0x04, 0x3e, + 0x04, 0x39, 0x00, 0x20, 0x04, 0x34, 0x04, 0x38, + 0x04, 0x30, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x37, + 0x04, 0x3e, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x46, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x32, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, 0x04, 0x43, + 0x04, 0x35, 0x04, 0x42, 0x04, 0x41, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x44, 0x04, 0x3e, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x44, 0x04, 0x30, 0x04, 0x3c, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x37, + 0x04, 0x43, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x30, 0x04, 0x46, 0x04, 0x38, + 0x04, 0x38, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, 0x04, 0x3a, + 0x04, 0x42, 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x30, 0x04, 0x40, 0x04, 0x45, 0x04, 0x38, + 0x04, 0x32, 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x46, 0x04, 0x38, + 0x04, 0x44, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x41, 0x00, 0x57, 0x00, 0x2d, 0x04, 0x3d, + 0x04, 0x35, 0x04, 0x33, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x38, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x32, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x15, 0x04, 0x41, + 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x4b, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x42, 0x04, 0x30, 0x04, 0x35, + 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, + 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, + 0x04, 0x40, 0x04, 0x4f, 0x04, 0x34, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x4c, + 0x04, 0x4e, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x38, 0x04, 0x42, + 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x46, 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x3b, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x4b, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, 0x04, 0x35, 0x04, 0x42, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x35, - 0x04, 0x40, 0x04, 0x56, 0x04, 0x33, 0x04, 0x30, - 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x35, 0x04, 0x33, 0x04, 0x3c, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x42, 0x04, 0x30, 0x04, 0x46, - 0x04, 0x56, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x56, 0x04, 0x32, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x56, 0x04, 0x34, 0x00, 0x20, - 0x04, 0x47, 0x04, 0x30, 0x04, 0x41, 0x00, 0x20, - 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, - 0x04, 0x33, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x2e, - 0x00, 0x00, 0x67, 0x00, 0x52, 0x1d, 0x75, 0x31, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x43, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x34, 0x04, 0x35, 0x04, 0x42, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x4b, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, + 0x04, 0x30, 0x04, 0x3a, 0x04, 0x42, 0x04, 0x38, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x38, 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, 0x00, 0x2e, + 0x00, 0x00, 0x04, 0x1f, 0x04, 0x40, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x38, 0x04, 0x42, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x33, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3c, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x18, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x3c, 0x04, 0x30, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x1a, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x30, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x37, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x33, 0x04, 0x30, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x20, 0x04, 0x1e, + 0x04, 0x1c, 0x04, 0x1c, 0x00, 0x20, 0x04, 0x20, + 0x04, 0x13, 0x04, 0x11, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x40, 0x04, 0x3b, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x48, 0x04, 0x38, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x3f, 0x04, 0x41, 0x04, 0x35, 0x04, 0x33, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x58, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x33, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x44, 0x04, 0x3e, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x44, 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x46, 0x04, 0x40, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x5a, 0x04, 0x35, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x43, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x52, 0x04, 0x38, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x5a, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x30, 0x04, 0x40, + 0x04, 0x45, 0x04, 0x38, 0x04, 0x32, 0x04, 0x38, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x5a, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x38, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x32, 0x04, 0x38, 0x04, 0x45, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x3a, 0x04, 0x30, 0x00, 0x2e, 0x00, 0x20, + 0x04, 0x1e, 0x04, 0x41, 0x04, 0x38, 0x04, 0x3c, + 0x00, 0x20, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x34, 0x04, 0x38, + 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x47, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x48, + 0x04, 0x5b, 0x04, 0x43, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x34, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x38, 0x04, 0x42, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x3b, 0x04, 0x43, 0x00, 0x2c, + 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, + 0x04, 0x35, 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x38, 0x04, 0x34, 0x04, 0x35, + 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x34, 0x04, 0x40, 0x04, 0x43, 0x04, 0x36, + 0x04, 0x38, 0x04, 0x32, 0x04, 0x30, 0x04, 0x5a, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, + 0x04, 0x58, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x43, 0x04, 0x40, 0x04, 0x35, 0x04, 0x52, + 0x04, 0x43, 0x04, 0x58, 0x04, 0x35, 0x04, 0x42, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, + 0x04, 0x38, 0x04, 0x3a, 0x04, 0x35, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x72, 0x00, 0xe5, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x62, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x6a, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, 0x00, 0x45, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, + 0x00, 0x6f, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6d, 0x00, 0xe4, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x20, 0x00, 0x6d, 0x00, 0xe5, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, + 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x41, 0x00, 0x57, 0x00, 0x2d, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x4f, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x64, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, + 0x00, 0x67, 0x00, 0x62, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x67, 0x00, 0x20, 0x00, 0x6e, 0x00, 0xe4, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x42, + 0x00, 0x61, 0x01, 0x5f, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x67, 0x01, 0x31, 0x00, 0x63, + 0x01, 0x31, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x45, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x8a, 0x2d, - 0x8a, 0x08, 0xff, 0x0c, 0x4e, 0x14, 0x7a, 0x31, - 0x4e, 0x4b, 0x70, 0xba, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x4d, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x30, 0x02, - 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, - 0x53, 0xef, 0x98, 0x6f, 0x79, 0x3a, 0x97, 0x5e, - 0x5e, 0x38, 0x59, 0x27, 0x7b, 0xc4, 0x57, 0x0d, - 0x76, 0x84, 0x82, 0x72, 0x5f, 0x69, 0xff, 0x0c, - 0x8a, 0x31, 0x59, 0x1a, 0x65, 0x1d, 0x5f, 0x71, - 0x5e, 0x2b, 0x5c, 0x07, 0x5b, 0x83, 0x75, 0x28, - 0x65, 0xbc, 0x00, 0x20, 0x00, 0x52, 0x00, 0x41, - 0x00, 0x57, 0x00, 0x20, 0x5f, 0x71, 0x50, 0xcf, - 0x76, 0x84, 0x7b, 0x97, 0x7e, 0x6a, 0x30, 0x01, - 0x7d, 0xe8, 0x8f, 0x2f, 0x30, 0x01, 0x5c, 0x01, - 0x5b, 0x58, 0x75, 0x28, 0x90, 0x14, 0x30, 0x02, - 0x96, 0x64, 0x97, 0x5e, 0x60, 0xa8, 0x6b, 0x63, - 0x4f, 0x7f, 0x75, 0x28, 0x6b, 0xcf, 0x90, 0x1a, - 0x90, 0x53, 0x67, 0x09, 0x00, 0x20, 0x00, 0x31, - 0x00, 0x36, 0x00, 0x20, 0x4f, 0x4d, 0x51, 0x43, - 0x7c, 0xbe, 0x6e, 0x96, 0x5e, 0xa6, 0x76, 0x84, - 0x88, 0xdd, 0x7f, 0x6e, 0xff, 0x0c, 0x54, 0x26, - 0x52, 0x47, 0x7d, 0xe8, 0x8f, 0x2f, 0x5f, 0x71, - 0x50, 0xcf, 0x66, 0x42, 0x53, 0xef, 0x80, 0xfd, - 0x67, 0x03, 0x77, 0x0b, 0x89, 0x8b, 0x82, 0x72, - 0x5e, 0x36, 0x75, 0x22, 0x75, 0x1f, 0x30, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x6f, 0x72, 0x67, 0x2e, - 0x66, 0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b, - 0x74, 0x6f, 0x70, 0x2e, 0x43, 0x6f, 0x6c, 0x6f, - 0x72, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, - 0x2e, 0x53, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x2e, - 0x78, 0x6d, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc5, 0x1e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xcd, 0x59, 0x6d, 0x6f, 0xdb, 0x36, - 0x10, 0xfe, 0xde, 0x5f, 0xc1, 0xea, 0x4b, 0x80, - 0x22, 0x96, 0x92, 0xbd, 0x75, 0x28, 0x92, 0x14, - 0x4d, 0xd2, 0x0d, 0x41, 0xd3, 0xa6, 0x9d, 0x93, - 0xae, 0xdd, 0x30, 0x0c, 0x94, 0x78, 0xb6, 0x39, - 0x53, 0xa4, 0x4a, 0x52, 0x76, 0xbc, 0x61, 0xff, - 0x7d, 0x47, 0x52, 0x96, 0x25, 0xd7, 0x79, 0x53, - 0xec, 0xc1, 0x41, 0xd1, 0xc8, 0x32, 0x79, 0xbc, - 0x7b, 0xee, 0xf8, 0xdc, 0x43, 0xe6, 0xe0, 0xe5, - 0x75, 0x2e, 0xc8, 0x04, 0xb4, 0xe1, 0x4a, 0x1e, - 0x46, 0xfb, 0xf1, 0x5e, 0xf4, 0xf2, 0xe8, 0xc9, - 0xc1, 0xd3, 0xd3, 0x8b, 0x93, 0xcb, 0xcf, 0xef, - 0x5f, 0x13, 0xa9, 0x18, 0x90, 0xf7, 0x57, 0xc7, - 0xe7, 0x67, 0x27, 0x24, 0xea, 0x25, 0xc9, 0x40, - 0x03, 0x30, 0x30, 0x63, 0xab, 0x8a, 0x24, 0x39, - 0xbd, 0x3c, 0x25, 0xa7, 0xbd, 0xe3, 0xab, 0x3e, - 0xb9, 0x48, 0xff, 0x82, 0xcc, 0x92, 0x33, 0x69, - 0xb5, 0x32, 0x05, 0x3e, 0xa2, 0x35, 0x82, 0xc6, - 0x92, 0xe4, 0xf5, 0xbb, 0x88, 0x44, 0x23, 0x6b, - 0x8b, 0x17, 0x49, 0x32, 0x9d, 0x4e, 0xe3, 0x86, - 0x81, 0x58, 0xe9, 0x61, 0x62, 0x2c, 0x95, 0x8c, - 0x6a, 0x66, 0x12, 0x96, 0x96, 0x26, 0x71, 0x73, - 0x78, 0x6d, 0x25, 0x66, 0x96, 0x45, 0xe8, 0x8e, - 0xf7, 0x02, 0x1d, 0x95, 0xe6, 0x05, 0x53, 0xd9, - 0xe1, 0x6d, 0xf6, 0x6a, 0x2b, 0x38, 0xd0, 0x4f, - 0x27, 0x92, 0xe6, 0x70, 0x18, 0x25, 0xd1, 0xd1, - 0x01, 0x1a, 0x06, 0x3d, 0xa0, 0x19, 0x54, 0xef, - 0x70, 0x7c, 0x6b, 0xfe, 0x89, 0x12, 0x4a, 0xbf, - 0xa5, 0x92, 0x0e, 0x41, 0xc7, 0x7d, 0x90, 0x46, - 0x69, 0x9c, 0x85, 0x86, 0xdc, 0xaa, 0xd5, 0x03, - 0x98, 0x4c, 0xf3, 0xc2, 0xc5, 0x17, 0x5e, 0x14, - 0x54, 0xd3, 0xa3, 0x27, 0xa4, 0xfe, 0xb9, 0x1c, - 0x01, 0x59, 0xac, 0x53, 0x1a, 0x60, 0x64, 0xa0, - 0x34, 0xf9, 0x52, 0x82, 0xe6, 0x72, 0x48, 0x32, - 0xb7, 0x04, 0x31, 0xde, 0xb6, 0x89, 0xeb, 0x79, - 0x07, 0x49, 0x6d, 0x2b, 0x3c, 0xb6, 0xd6, 0x49, - 0x6a, 0x17, 0x9e, 0xf6, 0x7a, 0xcf, 0xba, 0xff, - 0xf4, 0x7a, 0x47, 0x07, 0x85, 0x56, 0x05, 0x68, - 0x3b, 0xab, 0x20, 0x08, 0x51, 0x9e, 0x21, 0x4c, - 0x76, 0x56, 0xe0, 0x67, 0x13, 0x11, 0x9a, 0x65, - 0x60, 0xcc, 0x61, 0xa4, 0x81, 0xb2, 0x07, 0x87, - 0x1f, 0x00, 0x08, 0xf1, 0x11, 0xce, 0x88, 0xb1, - 0x2e, 0xec, 0xb8, 0x31, 0xe2, 0xbe, 0xa1, 0x26, - 0x73, 0x4f, 0x37, 0x10, 0xf5, 0x1b, 0x2e, 0xd7, - 0x1c, 0xf1, 0x18, 0x2d, 0x12, 0x35, 0x20, 0xb6, - 0x8e, 0x7e, 0x97, 0x40, 0x3c, 0x8c, 0x89, 0x9f, - 0x63, 0xed, 0x91, 0x4f, 0x7c, 0x5e, 0xca, 0x31, - 0x0f, 0x31, 0xe2, 0xab, 0x2d, 0x03, 0xa5, 0x6f, - 0xa9, 0x85, 0x35, 0xd7, 0x81, 0x33, 0x79, 0x2b, - 0x2c, 0x38, 0x42, 0x5b, 0xac, 0x90, 0x1a, 0x94, - 0xdd, 0x96, 0x91, 0xf9, 0x30, 0xce, 0x04, 0xd4, - 0x43, 0x08, 0x96, 0xd6, 0xfc, 0x8b, 0x1c, 0xa8, - 0x29, 0x75, 0xd3, 0xc0, 0xb6, 0xd5, 0xda, 0x5b, - 0xe4, 0xae, 0xf5, 0xa2, 0xea, 0xcc, 0x53, 0x07, - 0x1a, 0xc9, 0x1d, 0x2f, 0xde, 0x06, 0x2f, 0xcd, - 0x53, 0x0e, 0xd2, 0xde, 0x81, 0x6e, 0xa1, 0x3d, - 0x63, 0xad, 0x04, 0x18, 0x2b, 0x56, 0xaa, 0xa9, - 0xbc, 0x13, 0xde, 0xd5, 0xee, 0x5e, 0x48, 0x62, - 0x54, 0x0e, 0x84, 0xc1, 0x84, 0x63, 0xdc, 0xbb, - 0x84, 0xce, 0xb9, 0x61, 0x44, 0x0d, 0xb1, 0x8a, - 0xa4, 0xce, 0x71, 0xeb, 0x9e, 0xf0, 0x1b, 0xa4, - 0x7c, 0x3e, 0xe0, 0x59, 0xcb, 0x42, 0xa1, 0x0c, - 0xf7, 0xdd, 0x24, 0x05, 0xe4, 0x51, 0xc0, 0x61, - 0x0e, 0x39, 0x4f, 0xa5, 0xd4, 0xbd, 0x24, 0x96, - 0x8e, 0x41, 0xc6, 0x4b, 0x20, 0x71, 0x43, 0xea, - 0x34, 0x98, 0x91, 0x2a, 0x05, 0x6b, 0xac, 0xe4, - 0xd0, 0xca, 0x4a, 0xad, 0x11, 0x98, 0xca, 0x31, - 0x0f, 0xe4, 0xb6, 0x15, 0x4e, 0x1f, 0x3b, 0x06, - 0x15, 0x1b, 0x21, 0x66, 0xe3, 0x4d, 0x13, 0x59, - 0xe6, 0x29, 0x2c, 0x97, 0xcc, 0xde, 0xfe, 0x37, - 0xdf, 0x7e, 0xf7, 0xfd, 0x0f, 0xcf, 0x7f, 0xa4, - 0x5b, 0xbd, 0xa5, 0x36, 0x03, 0x8c, 0xab, 0x03, - 0xb1, 0x04, 0x48, 0x50, 0x05, 0x2d, 0xe6, 0xde, - 0x36, 0x40, 0x3e, 0x82, 0x64, 0xa8, 0x55, 0x36, - 0x81, 0xc8, 0xc4, 0x9b, 0x5e, 0x82, 0xe4, 0xd3, - 0x2f, 0xdc, 0xc2, 0xd6, 0xa2, 0xf1, 0x0e, 0xc9, - 0x71, 0x52, 0x73, 0x6e, 0xfa, 0x68, 0x34, 0xce, - 0x9a, 0x04, 0x4b, 0x90, 0x5a, 0x4c, 0x59, 0x14, - 0x4a, 0x5b, 0x94, 0x76, 0x53, 0x6e, 0x47, 0x48, - 0x49, 0xd2, 0xaf, 0x48, 0x98, 0xc6, 0xff, 0x11, - 0xab, 0xe9, 0x88, 0x67, 0x23, 0xc2, 0x14, 0x98, - 0x96, 0x1d, 0xa9, 0x2c, 0x92, 0xd7, 0x97, 0x92, - 0x3b, 0x1a, 0x63, 0xcc, 0xd3, 0x1a, 0xee, 0x42, - 0xab, 0x94, 0x70, 0x36, 0x71, 0x0a, 0x72, 0x22, - 0xd5, 0xc3, 0x99, 0x10, 0x59, 0x6e, 0xb6, 0x0d, - 0xd5, 0xd7, 0xc8, 0x15, 0x8c, 0x01, 0xdb, 0x20, - 0xae, 0x50, 0x2d, 0xe1, 0x04, 0x74, 0xa0, 0x69, - 0x41, 0x0b, 0x14, 0xe6, 0xd8, 0x2c, 0x34, 0x9b, - 0x52, 0x0d, 0xbb, 0x4e, 0x4b, 0xb7, 0x6c, 0xc0, - 0x35, 0xcd, 0x0b, 0x01, 0x7e, 0xf0, 0xaf, 0xcf, - 0xf7, 0xf6, 0xe6, 0x84, 0x3e, 0xd0, 0x2a, 0x27, - 0xe7, 0x20, 0xd5, 0x44, 0x3d, 0xac, 0x63, 0x79, - 0xa7, 0x9a, 0xed, 0xc3, 0xe5, 0xdb, 0xf5, 0x8d, - 0x11, 0xc8, 0xd0, 0x39, 0xa8, 0xe0, 0xa9, 0xeb, - 0xbf, 0xd8, 0x93, 0x70, 0x90, 0x43, 0xa0, 0x6a, - 0x31, 0x2d, 0x3b, 0xf8, 0x6a, 0x1a, 0xc6, 0x7b, - 0xc5, 0x5f, 0x50, 0x8b, 0xf9, 0x1d, 0x94, 0x42, - 0x20, 0x2c, 0x80, 0xa6, 0xf0, 0xd4, 0x33, 0xef, - 0x4c, 0x90, 0x73, 0x8b, 0x9f, 0x09, 0x2d, 0x19, - 0x4f, 0x05, 0xb4, 0xcc, 0x50, 0x81, 0x4e, 0x60, - 0x41, 0xe1, 0x8c, 0x4c, 0xb9, 0x48, 0xb1, 0xea, - 0xb6, 0xad, 0x32, 0xce, 0x55, 0x36, 0xde, 0x68, - 0x5d, 0x08, 0xbf, 0x80, 0x3f, 0x47, 0xe1, 0x81, - 0x8a, 0xa4, 0xb3, 0x00, 0xea, 0xd6, 0x01, 0x71, - 0x42, 0x0b, 0x9a, 0x72, 0x81, 0x1b, 0x1b, 0xcc, - 0x1c, 0x0e, 0xba, 0x1e, 0x36, 0xce, 0x1a, 0xa6, - 0x57, 0x28, 0xbe, 0x9a, 0x99, 0x7f, 0xdf, 0x61, - 0xdc, 0x14, 0x82, 0xce, 0x76, 0xda, 0x52, 0x6f, - 0xa7, 0xd2, 0x78, 0x3b, 0xbb, 0xee, 0x51, 0xb9, - 0xd3, 0xba, 0xf2, 0x1f, 0x4c, 0xa1, 0xec, 0xce, - 0x1f, 0x5b, 0xcb, 0xe5, 0x17, 0x7e, 0xb5, 0x05, - 0x9a, 0xff, 0x98, 0xc9, 0xbf, 0x5f, 0x01, 0x4a, - 0x25, 0x52, 0x6b, 0xd8, 0x91, 0x8b, 0x83, 0xfd, - 0x17, 0x5b, 0xc5, 0x19, 0x7f, 0xb0, 0xa7, 0xc7, - 0xa5, 0xc1, 0x5f, 0x97, 0x68, 0xe3, 0x1d, 0x0e, - 0x88, 0xc8, 0x84, 0x8a, 0x12, 0xc7, 0x7d, 0xf8, - 0x48, 0x51, 0x08, 0x49, 0xfb, 0x96, 0x16, 0x51, - 0xd2, 0x55, 0x8c, 0x7b, 0x07, 0xe7, 0x82, 0x52, - 0xcc, 0x3c, 0x5b, 0x28, 0xd9, 0xc8, 0xd0, 0xc3, - 0x08, 0xc8, 0x8b, 0x57, 0xfc, 0x47, 0x09, 0xe3, - 0xfe, 0x1e, 0x85, 0xea, 0x99, 0xcb, 0x78, 0x0d, - 0xcc, 0x18, 0x66, 0xc6, 0xd3, 0x87, 0x0f, 0xc2, - 0x84, 0xd6, 0xbc, 0x52, 0xd7, 0x6b, 0xc8, 0x95, - 0x85, 0x1e, 0xce, 0x1c, 0x70, 0x01, 0x3d, 0x94, - 0xdc, 0x23, 0x72, 0x88, 0x0c, 0x49, 0x59, 0x0a, - 0x30, 0xd8, 0x5e, 0x79, 0x07, 0x96, 0x32, 0x6a, - 0x69, 0x23, 0xe9, 0x66, 0x8d, 0x49, 0x3f, 0x61, - 0x7d, 0x7f, 0x29, 0xf1, 0x88, 0xa4, 0xe7, 0x95, - 0x87, 0x9e, 0x92, 0x9a, 0x5b, 0x31, 0x74, 0xfe, - 0x9c, 0x62, 0xdb, 0x90, 0x99, 0x28, 0xd9, 0xbc, - 0x3e, 0xa8, 0x68, 0xd9, 0xf0, 0x29, 0x14, 0x7c, - 0x0c, 0x75, 0xaa, 0x5e, 0x59, 0x4b, 0xb3, 0xd1, - 0x59, 0x4e, 0x87, 0x5b, 0xa4, 0xab, 0x30, 0xcc, - 0x91, 0x62, 0x0d, 0x96, 0xef, 0x40, 0x5e, 0x6e, - 0x9a, 0x69, 0xf2, 0x79, 0x83, 0xc5, 0x5d, 0xcf, - 0x2b, 0x0a, 0xc1, 0x33, 0x9f, 0xc6, 0x0e, 0x7d, - 0x7a, 0x71, 0x8e, 0x1b, 0x29, 0xc1, 0x40, 0xcf, - 0x99, 0xd1, 0x35, 0x0c, 0x82, 0x42, 0xcb, 0x1a, - 0xaf, 0xd0, 0x54, 0x69, 0x5d, 0xdb, 0x16, 0x98, - 0xf4, 0x95, 0xfb, 0xe4, 0x4a, 0xba, 0x09, 0x8b, - 0xe3, 0xaf, 0xef, 0xf5, 0xd8, 0x93, 0xdd, 0x2e, - 0x2c, 0xad, 0xca, 0xd1, 0x3d, 0x37, 0x7d, 0x46, - 0xdc, 0x86, 0x9a, 0x74, 0x6c, 0xc0, 0x01, 0xcc, - 0xb5, 0xa7, 0x25, 0xf8, 0xde, 0x21, 0x31, 0x61, - 0xe2, 0x4d, 0xa9, 0x51, 0xf8, 0x5a, 0x37, 0xb3, - 0x63, 0xb6, 0x29, 0xe8, 0x9f, 0xc1, 0xf6, 0xbd, - 0xee, 0xeb, 0x10, 0x37, 0xce, 0x75, 0xe4, 0x5a, - 0x5d, 0xc4, 0x06, 0xf5, 0x58, 0x1a, 0x77, 0xa1, - 0x70, 0x37, 0x63, 0xdf, 0x16, 0x2b, 0x0a, 0xf7, - 0xc5, 0xf9, 0x2b, 0xb8, 0x59, 0x37, 0xed, 0x59, - 0x84, 0x64, 0xae, 0xc3, 0xb5, 0xf8, 0x61, 0xc4, - 0xe5, 0xb2, 0xdb, 0xa6, 0xcc, 0x73, 0xa4, 0xf9, - 0x9b, 0x5c, 0x5e, 0x92, 0x00, 0x33, 0x32, 0xc5, - 0x03, 0x84, 0xae, 0xdc, 0x5e, 0xbe, 0x67, 0xd4, - 0x37, 0xdd, 0xf6, 0x90, 0x9b, 0x6f, 0x85, 0xea, - 0x6f, 0x44, 0xc6, 0xee, 0x9c, 0x2d, 0x80, 0xad, - 0xbc, 0x29, 0xaa, 0x65, 0xc5, 0x4a, 0x02, 0x5b, - 0x01, 0x64, 0x1d, 0x75, 0xa3, 0x60, 0x10, 0xc5, - 0x26, 0x94, 0xf5, 0xf5, 0x7d, 0x48, 0xd4, 0x9f, - 0xd7, 0x2d, 0x20, 0x71, 0x5f, 0x77, 0x42, 0xf2, - 0x53, 0x68, 0x05, 0xbb, 0x4d, 0xef, 0x7b, 0xfb, - 0xf1, 0xde, 0x22, 0x2c, 0xb7, 0x13, 0x90, 0x9d, - 0x40, 0xeb, 0x76, 0x31, 0xdc, 0x87, 0x99, 0x08, - 0xf9, 0xa9, 0xea, 0x0a, 0x8d, 0x8c, 0x21, 0x31, - 0xdd, 0x84, 0x7e, 0x38, 0x6f, 0x70, 0xb3, 0x64, - 0xc4, 0x19, 0x48, 0x35, 0x1f, 0x8e, 0xac, 0x74, - 0x47, 0x0c, 0x2e, 0xc9, 0x79, 0x79, 0xbd, 0x7e, - 0x44, 0x67, 0x6b, 0x41, 0xf4, 0xf3, 0x9a, 0x10, - 0xed, 0x1a, 0xc5, 0xdf, 0x6b, 0x89, 0xe2, 0xb7, - 0xff, 0x25, 0x8a, 0x4d, 0x91, 0x62, 0x1f, 0xec, - 0x5c, 0x2d, 0x3f, 0x9c, 0x15, 0xfb, 0x8e, 0x15, - 0x95, 0x04, 0x17, 0x7a, 0x5e, 0x0a, 0xcb, 0x1d, - 0x2d, 0xce, 0xb5, 0xed, 0xbd, 0xd4, 0xec, 0xfd, - 0xb8, 0xb1, 0x12, 0xf0, 0xc1, 0xe3, 0x20, 0x60, - 0xbf, 0xe6, 0xc6, 0x87, 0x4a, 0xbb, 0xf8, 0x4c, - 0xee, 0xdd, 0x4b, 0xd3, 0xdf, 0x59, 0x05, 0xaf, - 0xba, 0x8b, 0xee, 0x47, 0xc9, 0xee, 0xae, 0xf5, - 0x43, 0x1e, 0x51, 0x40, 0xcf, 0x88, 0x2b, 0x21, - 0xc3, 0x87, 0xee, 0x12, 0x2a, 0xe0, 0x7c, 0x5c, - 0x5a, 0xab, 0xe4, 0x7b, 0x8d, 0x84, 0x03, 0x5d, - 0x4e, 0xaa, 0xaf, 0x48, 0xea, 0x2d, 0xb4, 0x2b, - 0xc6, 0xdf, 0xf5, 0xa7, 0xee, 0xd2, 0xa3, 0x08, - 0x96, 0x3b, 0x49, 0x89, 0xe0, 0x28, 0x3e, 0xd4, - 0x7f, 0x5d, 0xc5, 0x67, 0xf7, 0x87, 0xe1, 0xa3, - 0x27, 0xff, 0x01, 0x95, 0x54, 0x2d, 0xc4, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, + 0x01, 0x31, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6d, 0x01, 0x31, + 0x01, 0x5f, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, + 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x01, 0x31, + 0x00, 0x72, 0x01, 0x31, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0xe7, 0x00, 0x6f, + 0x00, 0x6b, 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x69, 0x01, 0x5f, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, + 0x00, 0xfc, 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x79, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, + 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0xfc, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x79, + 0x00, 0x65, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x20, 0x00, 0xe7, 0x00, 0x6f, + 0x00, 0x6b, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x74, 0x00, 0x6f, 0x01, 0x1f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x66, 0x00, 0xe7, 0x01, 0x31, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x66, 0x01, 0x31, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, 0x00, 0xe7, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, 0x00, 0x28, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x29, 0x00, 0x20, + 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, + 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x64, 0x01, 0x31, + 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x48, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x68, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6c, + 0x01, 0x31, 0x01, 0x1f, 0x01, 0x31, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x61, 0x01, 0x5f, 0x01, 0x31, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x31, + 0x00, 0x36, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x20, 0x00, 0xe7, 0x00, 0x61, + 0x00, 0x6c, 0x01, 0x31, 0x01, 0x5f, 0x01, 0x31, + 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x64, + 0x01, 0x31, 0x00, 0x6b, 0x00, 0xe7, 0x00, 0x61, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x64, 0x00, 0xfc, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x6b, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6b, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6b, + 0x01, 0x31, 0x00, 0x6d, 0x01, 0x31, 0x00, 0x6e, + 0x01, 0x31, 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x62, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x72, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x7a, + 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1f, 0x04, 0x35, + 0x04, 0x40, 0x04, 0x48, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, 0x04, 0x41, + 0x04, 0x56, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x46, + 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4e, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x43, 0x04, 0x3b, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x37, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, + 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x56, + 0x04, 0x54, 0x04, 0x4e, 0x00, 0x20, 0x00, 0x45, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x26, 0x04, 0x4e, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, + 0x04, 0x41, 0x04, 0x56, 0x04, 0x4e, 0x00, 0x20, + 0x04, 0x31, 0x04, 0x43, 0x04, 0x3b, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x37, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3e, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, + 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x17, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3e, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x3e, 0x04, 0x4e, 0x00, 0x20, + 0x04, 0x46, 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x33, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, + 0x04, 0x4e, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, + 0x04, 0x36, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x56, 0x04, 0x34, 0x04, 0x42, + 0x04, 0x32, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x4e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x43, 0x04, 0x36, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x32, 0x04, 0x35, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x43, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x56, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x3a, 0x04, 0x56, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x56, 0x04, 0x32, 0x00, 0x2e, + 0x00, 0x20, 0x04, 0x1d, 0x04, 0x38, 0x04, 0x3c, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, + 0x04, 0x4e, 0x04, 0x42, 0x04, 0x4c, 0x04, 0x41, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x31, 0x04, 0x30, + 0x04, 0x33, 0x04, 0x30, 0x04, 0x42, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x44, 0x04, 0x3e, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x44, 0x04, 0x56, 0x04, 0x32, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x30, 0x04, 0x40, 0x04, 0x45, 0x04, 0x56, + 0x04, 0x32, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x46, 0x04, 0x38, + 0x04, 0x44, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x35, 0x04, 0x33, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x38, 0x04, 0x32, 0x04, 0x56, 0x04, 0x32, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x2f, 0x04, 0x3a, + 0x04, 0x49, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, + 0x04, 0x54, 0x04, 0x42, 0x04, 0x35, 0x04, 0x41, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x47, 0x04, 0x3d, 0x04, 0x56, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x43, + 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, + 0x04, 0x31, 0x04, 0x56, 0x04, 0x42, 0x04, 0x56, + 0x04, 0x32, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x43, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x37, 0x04, 0x56, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x46, 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x33, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, + 0x04, 0x4e, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, + 0x04, 0x35, 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x35, 0x04, 0x40, 0x04, 0x56, + 0x04, 0x33, 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x35, 0x04, 0x33, + 0x04, 0x3c, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, + 0x04, 0x30, 0x04, 0x46, 0x04, 0x56, 0x04, 0x4e, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, + 0x04, 0x32, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x56, + 0x04, 0x34, 0x00, 0x20, 0x04, 0x47, 0x04, 0x30, + 0x04, 0x41, 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, + 0x04, 0x34, 0x04, 0x30, 0x04, 0x33, 0x04, 0x43, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, + 0x04, 0x4f, 0x00, 0x2e, 0x00, 0x00, 0x67, 0x00, + 0x52, 0x1d, 0x75, 0x31, 0x00, 0x20, 0x00, 0x45, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x4b, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x20, 0x8a, 0x2d, 0x8a, 0x08, 0xff, 0x0c, + 0x4e, 0x14, 0x7a, 0x31, 0x4e, 0x4b, 0x70, 0xba, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x4f, 0x00, 0x4d, + 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x30, 0x02, 0x6b, 0x64, 0x63, 0xcf, + 0x8f, 0xf0, 0x6a, 0x94, 0x53, 0xef, 0x98, 0x6f, + 0x79, 0x3a, 0x97, 0x5e, 0x5e, 0x38, 0x59, 0x27, + 0x7b, 0xc4, 0x57, 0x0d, 0x76, 0x84, 0x82, 0x72, + 0x5f, 0x69, 0xff, 0x0c, 0x8a, 0x31, 0x59, 0x1a, + 0x65, 0x1d, 0x5f, 0x71, 0x5e, 0x2b, 0x5c, 0x07, + 0x5b, 0x83, 0x75, 0x28, 0x65, 0xbc, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x41, 0x00, 0x57, 0x00, 0x20, + 0x5f, 0x71, 0x50, 0xcf, 0x76, 0x84, 0x7b, 0x97, + 0x7e, 0x6a, 0x30, 0x01, 0x7d, 0xe8, 0x8f, 0x2f, + 0x30, 0x01, 0x5c, 0x01, 0x5b, 0x58, 0x75, 0x28, + 0x90, 0x14, 0x30, 0x02, 0x96, 0x64, 0x97, 0x5e, + 0x60, 0xa8, 0x6b, 0x63, 0x4f, 0x7f, 0x75, 0x28, + 0x6b, 0xcf, 0x90, 0x1a, 0x90, 0x53, 0x67, 0x09, + 0x00, 0x20, 0x00, 0x31, 0x00, 0x36, 0x00, 0x20, + 0x4f, 0x4d, 0x51, 0x43, 0x7c, 0xbe, 0x6e, 0x96, + 0x5e, 0xa6, 0x76, 0x84, 0x88, 0xdd, 0x7f, 0x6e, + 0xff, 0x0c, 0x54, 0x26, 0x52, 0x47, 0x7d, 0xe8, + 0x8f, 0x2f, 0x5f, 0x71, 0x50, 0xcf, 0x66, 0x42, + 0x53, 0xef, 0x80, 0xfd, 0x67, 0x03, 0x77, 0x0b, + 0x89, 0x8b, 0x82, 0x72, 0x5e, 0x36, 0x75, 0x22, + 0x75, 0x1f, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x6f, 0x72, 0x67, 0x2e, 0x66, 0x72, 0x65, 0x65, + 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2e, + 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x4d, 0x61, 0x6e, + 0x61, 0x67, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x6e, + 0x73, 0x6f, 0x72, 0x2e, 0x78, 0x6d, 0x6c, 0x00, + 0x20, 0x23, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xed, 0x5a, 0x6d, 0x6f, 0xdb, 0x36, + 0x10, 0xfe, 0xde, 0x5f, 0xc1, 0xe9, 0x4b, 0x80, + 0x22, 0xb6, 0xd2, 0xbd, 0x75, 0x28, 0x92, 0x14, + 0x4d, 0xd2, 0x0d, 0xc1, 0xd2, 0xa6, 0x9d, 0xd3, + 0xae, 0xdd, 0x30, 0x14, 0x94, 0x78, 0xb6, 0xb8, + 0x50, 0xa4, 0x4a, 0x52, 0x76, 0xbc, 0x61, 0xff, + 0x7d, 0x47, 0x52, 0x96, 0x25, 0xd7, 0x79, 0x73, + 0xe4, 0x41, 0x1f, 0x66, 0x04, 0xb1, 0x2c, 0x93, + 0xc7, 0xbb, 0xe7, 0x8e, 0xcf, 0xdd, 0x51, 0xde, + 0x7f, 0x7e, 0x95, 0x0b, 0x32, 0x05, 0x6d, 0xb8, + 0x92, 0x07, 0xd1, 0x93, 0xe1, 0x5e, 0xf4, 0xfc, + 0xf0, 0xd1, 0xfe, 0x57, 0x27, 0xe7, 0xc7, 0x17, + 0x1f, 0xdf, 0xbc, 0x24, 0x52, 0x31, 0x20, 0x6f, + 0xde, 0x1d, 0x9d, 0x9d, 0x1e, 0x93, 0x68, 0x10, + 0xc7, 0x63, 0x0d, 0xc0, 0xc0, 0x5c, 0x5a, 0x55, + 0xc4, 0xf1, 0xc9, 0xc5, 0x09, 0x39, 0x19, 0x1c, + 0xbd, 0x1b, 0x91, 0xf3, 0xe4, 0x4f, 0x48, 0x2d, + 0x39, 0x95, 0x56, 0x2b, 0x53, 0xe0, 0x25, 0x4a, + 0x23, 0x28, 0x2c, 0x8e, 0x5f, 0xbe, 0x8e, 0x48, + 0x94, 0x59, 0x5b, 0x3c, 0x8b, 0xe3, 0xd9, 0x6c, + 0x36, 0x6c, 0x08, 0x18, 0x2a, 0x3d, 0x89, 0x8d, + 0xa5, 0x92, 0x51, 0xcd, 0x4c, 0xcc, 0x92, 0xd2, + 0xc4, 0x6e, 0x0e, 0xaf, 0xa5, 0x0c, 0x99, 0x65, + 0x11, 0xaa, 0xe3, 0xb5, 0x40, 0x45, 0xa5, 0x79, + 0xc6, 0x54, 0x7a, 0x70, 0x93, 0xbc, 0x5a, 0x0a, + 0x0e, 0xf4, 0xd3, 0x89, 0xa4, 0x39, 0x1c, 0x44, + 0x71, 0x74, 0xb8, 0x8f, 0x82, 0x41, 0x8f, 0x69, + 0x0a, 0xd5, 0x3d, 0x1c, 0xdf, 0x9a, 0x7f, 0xac, + 0x84, 0xd2, 0xaf, 0xa8, 0xa4, 0x13, 0xd0, 0xc3, + 0x11, 0x48, 0xa3, 0x34, 0xce, 0x42, 0x41, 0x6e, + 0xd5, 0xea, 0x02, 0x4c, 0xaa, 0x79, 0xe1, 0xec, + 0x0b, 0x37, 0x0a, 0xaa, 0xe9, 0xe1, 0x23, 0x52, + 0xbf, 0x2e, 0x32, 0x20, 0xcb, 0x75, 0x4a, 0x03, + 0x8c, 0x8c, 0x95, 0x26, 0x9f, 0x4b, 0xd0, 0x5c, + 0x4e, 0x48, 0xea, 0x96, 0x20, 0xc6, 0xcb, 0x36, + 0xc3, 0x7a, 0xde, 0x7e, 0x5c, 0xcb, 0x0a, 0x97, + 0xad, 0x75, 0xe2, 0x5a, 0x85, 0xaf, 0x06, 0x83, + 0xc7, 0x9b, 0xbf, 0x06, 0x83, 0xc3, 0xfd, 0x42, + 0xab, 0x02, 0xb4, 0x9d, 0x57, 0x10, 0x04, 0x2b, + 0x4f, 0x11, 0x26, 0x3b, 0x2f, 0xf0, 0xb3, 0x89, + 0x08, 0x4d, 0x53, 0x30, 0xe6, 0x20, 0xd2, 0x40, + 0xd9, 0xbd, 0xcd, 0x0f, 0x00, 0x04, 0xfb, 0x08, + 0x67, 0xc4, 0x58, 0x67, 0xf6, 0xb0, 0x31, 0xe2, + 0xae, 0xa6, 0xc6, 0x0b, 0x4d, 0xb7, 0x60, 0xf5, + 0xcf, 0x5c, 0x76, 0x6c, 0xf1, 0x25, 0x4a, 0x24, + 0x6a, 0x4c, 0x6c, 0x6d, 0xfd, 0x2e, 0x81, 0xe1, + 0x64, 0x48, 0xfc, 0x1c, 0x6b, 0x0f, 0xbd, 0xe3, + 0xf3, 0x52, 0x5e, 0xf2, 0x60, 0x23, 0xde, 0xea, + 0x19, 0x28, 0x23, 0x4b, 0x2d, 0x74, 0x1c, 0x07, + 0x4e, 0xe4, 0x8d, 0xb0, 0xe0, 0x08, 0x6d, 0x31, + 0x42, 0x6a, 0x50, 0x76, 0x5b, 0x42, 0x16, 0xc3, + 0x38, 0x13, 0x50, 0x0f, 0x21, 0x18, 0x5a, 0x8b, + 0x2f, 0x72, 0xa0, 0xa6, 0xd4, 0x4d, 0x01, 0x7d, + 0x8b, 0xb5, 0x57, 0xc8, 0x5d, 0xdd, 0xa2, 0xea, + 0xc4, 0x53, 0x07, 0x1a, 0xc9, 0x1d, 0x2f, 0xde, + 0x04, 0x2f, 0xcd, 0x13, 0x0e, 0xd2, 0xde, 0x82, + 0x6e, 0xa1, 0x3d, 0x63, 0xad, 0x05, 0x18, 0x23, + 0x56, 0xaa, 0x99, 0xbc, 0x15, 0xde, 0xf5, 0xea, + 0x9e, 0x4b, 0x62, 0x54, 0x0e, 0x84, 0xc1, 0x94, + 0xa3, 0xdd, 0xbb, 0x84, 0x2e, 0xb8, 0x21, 0xa3, + 0x86, 0x58, 0x45, 0x12, 0xa7, 0xb8, 0x75, 0x57, + 0xf8, 0x0d, 0x52, 0x3e, 0x1f, 0xf3, 0xb4, 0x25, + 0xa1, 0x50, 0x86, 0xfb, 0x6c, 0x92, 0x00, 0xf2, + 0x28, 0xe0, 0x30, 0x87, 0x9c, 0xa7, 0x52, 0xea, + 0x6e, 0x12, 0x4b, 0x2f, 0x41, 0x0e, 0x57, 0x40, + 0xe2, 0x86, 0xd4, 0x6e, 0x30, 0x99, 0x2a, 0x05, + 0x6b, 0xac, 0xe4, 0xd0, 0x4a, 0x4b, 0xad, 0x11, + 0x98, 0x4a, 0x31, 0x0f, 0x64, 0xdf, 0x02, 0x67, + 0x84, 0x19, 0x83, 0x8a, 0xad, 0x10, 0xb3, 0xf1, + 0xa2, 0x89, 0x2c, 0xf3, 0x04, 0x56, 0x43, 0x66, + 0xef, 0xc9, 0xd7, 0xdf, 0x7c, 0xfb, 0xdd, 0xf7, + 0x4f, 0x7f, 0xa0, 0xbd, 0xde, 0x52, 0xdb, 0x01, + 0xc6, 0xc5, 0x81, 0x58, 0x01, 0x24, 0x54, 0x05, + 0x2d, 0xe6, 0xee, 0x1b, 0x20, 0xef, 0x41, 0x32, + 0xac, 0x55, 0xb6, 0x81, 0xc8, 0xd4, 0x8b, 0x5e, + 0x81, 0xe4, 0xc3, 0x2f, 0xdc, 0x42, 0x6f, 0xd1, + 0x78, 0x8d, 0xe4, 0x38, 0xad, 0x39, 0x37, 0x79, + 0x30, 0x1a, 0xa7, 0x4d, 0x82, 0x25, 0x48, 0x2d, + 0xa6, 0x2c, 0x0a, 0xa5, 0x2d, 0x96, 0x76, 0x33, + 0x6e, 0x33, 0xa4, 0x24, 0xe9, 0x57, 0x24, 0x4c, + 0xe3, 0x7f, 0xc4, 0x6a, 0x96, 0xf1, 0x34, 0x23, + 0x4c, 0x81, 0x69, 0xc9, 0x91, 0xca, 0x22, 0x79, + 0x7d, 0x2e, 0xb9, 0xa3, 0x31, 0xc6, 0x3c, 0xad, + 0xe1, 0x2e, 0xb4, 0x4a, 0x09, 0x27, 0x13, 0xa7, + 0x20, 0x27, 0x52, 0x3d, 0x99, 0x0b, 0x91, 0xe6, + 0xa6, 0x6f, 0xa8, 0xbe, 0x44, 0xae, 0x60, 0x0c, + 0xd8, 0x16, 0x71, 0x85, 0x6a, 0x09, 0x57, 0x40, + 0x07, 0x9a, 0x16, 0xb4, 0xc0, 0xc2, 0x1c, 0x93, + 0x85, 0x66, 0x33, 0xaa, 0x61, 0xd7, 0xd5, 0xd2, + 0x2d, 0x19, 0x70, 0x45, 0xf3, 0x42, 0x80, 0x1f, + 0xfc, 0xeb, 0xd3, 0xbd, 0xbd, 0x05, 0xa1, 0x8f, + 0xb5, 0xca, 0xc9, 0x19, 0x48, 0x35, 0x55, 0xf7, + 0xcb, 0x58, 0x5e, 0xa9, 0x66, 0xfa, 0x70, 0xfe, + 0x76, 0x79, 0x23, 0x03, 0x19, 0x32, 0x07, 0x15, + 0x3c, 0x71, 0xf9, 0x17, 0x73, 0x12, 0x0e, 0x72, + 0x08, 0x54, 0x29, 0xa6, 0x25, 0x07, 0x6f, 0xcd, + 0xc2, 0x78, 0x5f, 0xf1, 0x17, 0xd4, 0xa2, 0x7f, + 0xc7, 0xa5, 0x10, 0x08, 0x0b, 0xa0, 0x28, 0xec, + 0x7a, 0x16, 0x99, 0x09, 0x72, 0x6e, 0xf1, 0x33, + 0xa1, 0x25, 0xe3, 0x89, 0x80, 0x96, 0x18, 0x2a, + 0x50, 0x09, 0x0c, 0x28, 0x9c, 0x91, 0x2a, 0x67, + 0x29, 0x46, 0x5d, 0xdf, 0x22, 0xe3, 0x4c, 0xa5, + 0x97, 0x5b, 0x8d, 0x0b, 0xe1, 0x17, 0xf0, 0x7d, + 0x14, 0x36, 0x54, 0x24, 0x99, 0x07, 0x50, 0x7b, + 0x07, 0xc4, 0x31, 0x2d, 0x68, 0xc2, 0x05, 0x6e, + 0x6c, 0x30, 0x0b, 0x38, 0x68, 0x37, 0x6c, 0x9c, + 0x36, 0x44, 0xaf, 0xa9, 0xf8, 0x6a, 0x66, 0xfe, + 0x7d, 0x87, 0x71, 0x53, 0x08, 0x3a, 0xdf, 0x69, + 0x97, 0x7a, 0x3b, 0x55, 0x8d, 0xb7, 0xb3, 0xeb, + 0x2e, 0x95, 0xeb, 0xd6, 0x95, 0xff, 0x60, 0x0a, + 0x65, 0x77, 0xfe, 0xe8, 0x2d, 0x97, 0x9f, 0xfb, + 0xd5, 0x96, 0x68, 0xfe, 0x6d, 0xa6, 0xff, 0x7c, + 0x01, 0x28, 0x95, 0x48, 0xad, 0x61, 0x47, 0x2e, + 0x1b, 0xfb, 0xcf, 0xb6, 0xb2, 0x73, 0xf8, 0xd6, + 0x9e, 0x1c, 0x95, 0x06, 0xdf, 0x2e, 0x50, 0xc6, + 0x6b, 0x1c, 0x10, 0x91, 0x29, 0x15, 0x25, 0x8e, + 0x7b, 0xfb, 0x9e, 0x62, 0x21, 0x24, 0xed, 0x2b, + 0x5a, 0x44, 0xf1, 0xa6, 0xc5, 0xb8, 0x57, 0x70, + 0x51, 0x50, 0x8a, 0xb9, 0x67, 0x0b, 0x25, 0x1b, + 0x1e, 0xba, 0x1f, 0x01, 0xf9, 0xe2, 0x15, 0xff, + 0x28, 0x61, 0xdc, 0x9f, 0xa3, 0x50, 0x3d, 0x77, + 0x1e, 0xaf, 0x81, 0xb9, 0x84, 0xb9, 0xf1, 0xf4, + 0xe1, 0x8d, 0x30, 0x21, 0x35, 0xaf, 0xad, 0xeb, + 0x35, 0xe4, 0xca, 0xc2, 0x00, 0x67, 0x8e, 0xb9, + 0x80, 0x01, 0x96, 0xdc, 0x19, 0x39, 0x40, 0x86, + 0xa4, 0x2c, 0x01, 0x18, 0xf7, 0xb7, 0xbc, 0x03, + 0x4b, 0x19, 0xb5, 0xb4, 0xe1, 0x74, 0xd3, 0xa1, + 0xd3, 0x8f, 0xd9, 0xc8, 0x1f, 0x4a, 0x3c, 0xc0, + 0xe9, 0x79, 0xa5, 0xa1, 0xa7, 0xa4, 0xe6, 0x56, + 0x0c, 0x99, 0x3f, 0xa7, 0x98, 0x36, 0x64, 0x2a, + 0x4a, 0xb6, 0x88, 0x0f, 0x2a, 0x5a, 0x32, 0xbc, + 0x0b, 0x05, 0xbf, 0x84, 0xda, 0x55, 0x2f, 0xac, + 0xa5, 0x69, 0x76, 0x9a, 0xd3, 0x49, 0x8f, 0xea, + 0x2a, 0x34, 0x33, 0x53, 0xac, 0xc1, 0xf2, 0x1b, + 0x90, 0x97, 0x9b, 0x66, 0x9a, 0x7c, 0xde, 0x60, + 0x71, 0x97, 0xf3, 0x8a, 0x42, 0xf0, 0xd4, 0xbb, + 0x71, 0x83, 0x3c, 0xbd, 0xec, 0xe3, 0x32, 0x25, + 0x18, 0xe8, 0x05, 0x33, 0xba, 0x84, 0x41, 0xb0, + 0xd0, 0xb2, 0xc6, 0x57, 0x68, 0xaa, 0xb4, 0x2e, + 0x6d, 0x0b, 0x74, 0xfa, 0xda, 0x7d, 0xf2, 0x4e, + 0xba, 0x09, 0xcb, 0xf6, 0xd7, 0xe7, 0x7a, 0xcc, + 0xc9, 0x6e, 0x17, 0x96, 0x56, 0xe5, 0xa8, 0x9e, + 0x9b, 0x3e, 0x27, 0x6e, 0x43, 0x4d, 0x37, 0x4c, + 0xc0, 0x01, 0xcc, 0xce, 0xdd, 0x12, 0x74, 0xdf, + 0xc0, 0x31, 0x61, 0xe2, 0x75, 0xae, 0x51, 0x78, + 0x5b, 0x37, 0xbd, 0x63, 0xfa, 0x64, 0xf4, 0x4f, + 0x60, 0x47, 0xbe, 0xee, 0xdb, 0xc0, 0x6e, 0x9c, + 0xeb, 0xc8, 0xb5, 0x3a, 0x88, 0x0d, 0xd5, 0x63, + 0x69, 0xdc, 0x81, 0xc2, 0xed, 0x8c, 0x7d, 0x93, + 0xad, 0x58, 0xb8, 0x2f, 0xfb, 0xaf, 0xa0, 0x66, + 0x9d, 0xb4, 0xe7, 0x11, 0x92, 0xb9, 0x0e, 0xc7, + 0xe2, 0x07, 0x11, 0x97, 0xab, 0x6a, 0x9b, 0x32, + 0xcf, 0x91, 0xe6, 0xaf, 0x53, 0x79, 0xa5, 0x04, + 0x98, 0x93, 0x19, 0x36, 0x10, 0xba, 0x52, 0x7b, + 0xf5, 0x9c, 0x51, 0x5f, 0x77, 0xda, 0x43, 0xae, + 0x3f, 0x15, 0xaa, 0xbf, 0x11, 0x29, 0xbb, 0x75, + 0xb6, 0x00, 0xb6, 0xf6, 0xa4, 0xa8, 0x2e, 0x2b, + 0xd6, 0x12, 0xd8, 0x1a, 0x20, 0x6b, 0xab, 0x1b, + 0x01, 0x83, 0x28, 0x36, 0xa1, 0xac, 0x8f, 0xef, + 0x83, 0xa3, 0x3e, 0x5d, 0xb5, 0x80, 0xc4, 0x7d, + 0xbd, 0x11, 0x92, 0x1f, 0x42, 0x2a, 0xd8, 0x6d, + 0x6a, 0x3f, 0x78, 0x32, 0xdc, 0x5b, 0x9a, 0xe5, + 0x76, 0x02, 0xb2, 0x13, 0x68, 0xdd, 0x0e, 0x86, + 0xbb, 0x30, 0x13, 0x21, 0x3f, 0x56, 0x59, 0xa1, + 0xe1, 0x31, 0x24, 0xa6, 0xeb, 0xd0, 0x0f, 0xfd, + 0x06, 0x37, 0x2b, 0x42, 0x9c, 0x80, 0x44, 0xf3, + 0x49, 0x66, 0xa5, 0x6b, 0x31, 0xb8, 0x24, 0x67, + 0xe5, 0x55, 0xf7, 0x88, 0xce, 0x3b, 0x41, 0xf4, + 0x63, 0x47, 0x88, 0x6e, 0x6a, 0xc5, 0x5f, 0x9d, + 0x58, 0xf1, 0xdb, 0x7f, 0x62, 0xc5, 0x36, 0x49, + 0xd1, 0x3d, 0x34, 0xd3, 0x65, 0xfe, 0x60, 0x5a, + 0xac, 0xe4, 0xfc, 0x4f, 0x8c, 0xfd, 0x27, 0x46, + 0xf7, 0x00, 0xe5, 0x93, 0xcc, 0x3b, 0xd9, 0x00, + 0x5e, 0xd8, 0xa2, 0x88, 0x9a, 0xd1, 0x29, 0x08, + 0x90, 0x13, 0x9b, 0x11, 0x4d, 0xe5, 0xc4, 0x3d, + 0xd6, 0x24, 0x32, 0xef, 0x50, 0x75, 0x90, 0xac, + 0x2b, 0xc5, 0x61, 0xf9, 0xf4, 0x6d, 0x5b, 0x6a, + 0xd3, 0x5a, 0xef, 0xd0, 0x9b, 0x74, 0xa0, 0xb5, + 0x54, 0x72, 0x20, 0x95, 0xce, 0xa9, 0xe0, 0xee, + 0x39, 0xb1, 0xef, 0x28, 0xa8, 0xd6, 0x74, 0xde, + 0x37, 0x6a, 0x19, 0x81, 0x5d, 0x34, 0xe2, 0xf7, + 0x67, 0x96, 0x91, 0x63, 0x16, 0x25, 0xc1, 0x6d, + 0x89, 0xbc, 0x14, 0x96, 0xbb, 0x8a, 0x6b, 0xd1, + 0x36, 0xdf, 0xa9, 0x51, 0xbe, 0x1b, 0xbb, 0x54, + 0x67, 0x03, 0x41, 0xe3, 0xd0, 0x1b, 0x7f, 0xc9, + 0x2e, 0xf7, 0xed, 0x1a, 0x87, 0xa7, 0x72, 0xef, + 0x4e, 0xc7, 0x05, 0xb7, 0x3a, 0xfc, 0xc5, 0xe6, + 0xfd, 0xfc, 0x83, 0x3a, 0xfa, 0x4d, 0xe3, 0x87, + 0x3c, 0x20, 0x80, 0x1e, 0x13, 0x17, 0x42, 0x86, + 0x4f, 0xdc, 0xf9, 0x76, 0xc0, 0xf9, 0xa8, 0xb4, + 0x56, 0xc9, 0x37, 0x1a, 0x6b, 0x19, 0xd8, 0xe4, + 0x10, 0xec, 0x05, 0x49, 0xbc, 0x84, 0x76, 0xc4, + 0xf8, 0xc7, 0x88, 0x89, 0x3b, 0x4f, 0x2d, 0x82, + 0xe4, 0x8d, 0xba, 0x94, 0xa0, 0x28, 0x5e, 0xd4, + 0x3f, 0xdc, 0xc0, 0x6b, 0xf7, 0x9b, 0x93, 0xc3, + 0x47, 0xff, 0x02, 0x3e, 0xd9, 0x83, 0x1d, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -8035,131 +8774,150 @@ 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x42, 0x6c, 0x75, 0x69, 0x73, 0x68, 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc8, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x2d, 0xc8, 0x6c, 0x63, 0x6d, 0x73, + 0xf4, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x31, 0xf4, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x35, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x20, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0xf0, 0xa2, 0x34, 0xe5, - 0xc0, 0xd2, 0x7c, 0xc3, 0x37, 0x33, 0xf3, 0x19, - 0xea, 0x59, 0xdc, 0x98, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0x9c, 0x4b, 0x87, 0x47, + 0x4e, 0x95, 0x03, 0xc7, 0x3b, 0x6e, 0x19, 0x55, + 0x1a, 0x39, 0x78, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x64, 0x65, 0x73, 0x63, - 0x00, 0x00, 0x01, 0x2c, 0x00, 0x00, 0x01, 0xc8, - 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x02, 0xf4, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0x1c, + 0x00, 0x00, 0x01, 0x2c, 0x00, 0x00, 0x02, 0x16, + 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x03, 0x44, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0e, 0xc8, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0e, 0xdc, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0c, 0x48, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0c, 0x5c, + 0x00, 0x00, 0x0f, 0x08, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0f, 0x1c, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0c, 0x70, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0c, 0x84, + 0x00, 0x00, 0x0f, 0x30, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x20, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0c, 0x84, 0x00, 0x00, 0x00, 0x20, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0c, 0x84, + 0x00, 0x00, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x20, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0f, 0x44, 0x00, 0x00, 0x00, 0x20, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0c, 0xa4, 0x00, 0x00, 0x00, 0x24, - 0x76, 0x63, 0x67, 0x74, 0x00, 0x00, 0x0c, 0xc8, + 0x00, 0x00, 0x0f, 0x64, 0x00, 0x00, 0x00, 0x24, + 0x76, 0x63, 0x67, 0x74, 0x00, 0x00, 0x0f, 0x88, 0x00, 0x00, 0x06, 0x12, 0x6d, 0x65, 0x74, 0x61, - 0x00, 0x00, 0x12, 0xdc, 0x00, 0x00, 0x01, 0x0c, - 0x64, 0x6d, 0x64, 0x64, 0x00, 0x00, 0x13, 0xe8, - 0x00, 0x00, 0x19, 0xe0, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, + 0x00, 0x00, 0x15, 0x9c, 0x00, 0x00, 0x01, 0x0a, + 0x64, 0x6d, 0x64, 0x64, 0x00, 0x00, 0x16, 0xa8, + 0x00, 0x00, 0x1b, 0x4a, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x01, 0x0a, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x16, - 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, - 0x00, 0x00, 0x01, 0x20, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x2a, - 0x66, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x01, 0x34, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0x40, + 0x00, 0x00, 0x01, 0x3a, 0x64, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0x46, + 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, + 0x00, 0x00, 0x01, 0x4e, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x58, + 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, + 0x00, 0x00, 0x01, 0x62, 0x66, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x6c, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, + 0x00, 0x00, 0x01, 0x78, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0x82, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, - 0x00, 0x00, 0x01, 0x48, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0x52, + 0x00, 0x00, 0x01, 0x8a, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0x94, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x00, 0x00, 0x01, 0x5a, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0x5e, - 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x01, 0x66, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x7a, - 0x70, 0x74, 0x50, 0x54, 0x00, 0x00, 0x00, 0x0a, - 0x00, 0x00, 0x01, 0x84, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x8e, - 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x01, 0x9a, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0xa6, - 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, - 0x00, 0x00, 0x01, 0xae, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x01, 0xb8, - 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x04, - 0x00, 0x00, 0x01, 0xc4, 0x00, 0x42, 0x00, 0x6c, + 0x00, 0x00, 0x01, 0x9c, 0x6e, 0x62, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0xa0, + 0x6e, 0x62, 0x4e, 0x4f, 0x00, 0x00, 0x00, 0x08, + 0x00, 0x00, 0x01, 0xa8, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0xb0, + 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x00, 0x0a, + 0x00, 0x00, 0x01, 0xc4, 0x70, 0x74, 0x50, 0x54, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0xce, + 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x01, 0xd8, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x01, 0xe4, + 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, + 0x00, 0x00, 0x01, 0xf0, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x01, 0xf8, + 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x02, 0x02, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0e, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0x04, + 0x00, 0x00, 0x02, 0x12, 0x00, 0x42, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x65, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x72, 0x00, 0xe1, + 0x00, 0x00, 0x00, 0x42, 0x00, 0x6c, 0x00, 0xe5, 0x00, 0x00, 0x00, 0x42, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x75, 0x00, 0x00, 0x03, 0x9c, 0x03, 0xc0, 0x03, 0xbb, 0x03, 0xb5, 0x00, 0x00, 0x00, 0x41, 0x00, 0x7a, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x42, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x75, - 0x00, 0x65, 0x00, 0x00, 0x00, 0x4b, 0x00, 0xe9, - 0x00, 0x6b, 0x00, 0x00, 0x00, 0x42, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x75, 0x00, 0x00, 0x00, 0x42, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x00, 0x97, 0x52, - 0x00, 0x00, 0x00, 0x42, 0x00, 0x6c, 0x00, 0xe5, - 0x00, 0x00, 0x00, 0x4e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x6b, 0x00, 0x69, 0x00, 0x00, 0x00, 0x41, - 0x00, 0x7a, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x00, + 0x00, 0x65, 0x00, 0x00, 0x00, 0x41, 0x00, 0x7a, + 0x00, 0x75, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x4b, + 0x00, 0xe9, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x42, + 0x00, 0x69, 0x00, 0x72, 0x00, 0x75, 0x00, 0x00, + 0x00, 0x42, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x00, + 0x97, 0x52, 0x00, 0x00, 0x00, 0x42, 0x00, 0x6c, + 0x00, 0xe5, 0x00, 0x00, 0x00, 0x42, 0x00, 0x6c, + 0x00, 0xe5, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x62, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x00, 0x00, 0x41, 0x00, 0x7a, 0x00, 0x75, 0x00, 0x6c, - 0x00, 0x00, 0x04, 0x21, 0x04, 0x38, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x04, 0x1f, - 0x04, 0x3b, 0x04, 0x30, 0x04, 0x32, 0x04, 0x30, - 0x00, 0x00, 0x00, 0x42, 0x00, 0x6c, 0x00, 0xe5, - 0x00, 0x00, 0x00, 0x4d, 0x00, 0x61, 0x00, 0x76, - 0x00, 0x69, 0x00, 0x00, 0x04, 0x21, 0x04, 0x38, - 0x04, 0x3d, 0x04, 0x56, 0x04, 0x39, 0x00, 0x00, - 0x85, 0xcd, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, + 0x00, 0x00, 0x00, 0x41, 0x00, 0x7a, 0x00, 0x75, + 0x00, 0x6c, 0x00, 0x00, 0x04, 0x21, 0x04, 0x38, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, + 0x04, 0x1f, 0x04, 0x3b, 0x04, 0x30, 0x04, 0x32, + 0x04, 0x30, 0x00, 0x00, 0x00, 0x42, 0x00, 0x6c, + 0x00, 0xe5, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x00, 0x04, 0x21, + 0x04, 0x38, 0x04, 0x3d, 0x04, 0x56, 0x04, 0x39, + 0x00, 0x00, 0x85, 0xcd, 0x00, 0x00, 0x84, 0xdd, + 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0xe8, + 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x01, 0x52, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x01, 0xcc, - 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, - 0x00, 0x00, 0x02, 0x48, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x02, 0xf8, + 0x00, 0x00, 0x01, 0x9a, 0x64, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x02, 0x14, + 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, + 0x00, 0x00, 0x02, 0x82, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0xfe, + 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, + 0x00, 0x00, 0x03, 0xae, 0x67, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, - 0x00, 0x00, 0x03, 0x76, 0x69, 0x64, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x03, 0xe6, + 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, - 0x00, 0x00, 0x04, 0x5a, 0x6a, 0x61, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x04, 0xd2, - 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, - 0x00, 0x00, 0x05, 0x00, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x05, 0x80, + 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x05, 0xfa, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, + 0x00, 0x00, 0x06, 0x28, 0x6e, 0x62, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0x5c, + 0x6e, 0x62, 0x4e, 0x4f, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x00, 0x86, - 0x00, 0x00, 0x05, 0xf4, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x06, 0x7a, - 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x07, 0x02, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x07, 0x7c, - 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, - 0x00, 0x00, 0x07, 0xee, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x08, 0x7e, - 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, - 0x00, 0x00, 0x08, 0xf8, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x08, 0x56, + 0x73, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, + 0x00, 0x00, 0x08, 0xde, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x09, 0x52, + 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x09, 0xcc, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x0a, 0x3e, + 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x0a, 0xce, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0b, 0x48, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0x1e, + 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, @@ -8188,58 +8946,86 @@ 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x79, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, 0x00, 0x7a, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x6b, - 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, - 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, - 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, 0x03, 0xbb, - 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, 0x03, 0xad, - 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xc3, - 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, - 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb9, - 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbd, - 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb1, - 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xce, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, 0x03, 0xc9, - 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, - 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, + 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x62, 0x00, 0x65, 0x00, 0x67, + 0x00, 0x72, 0x00, 0xe6, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x68, 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, + 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, + 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, + 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xb1, 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, + 0x03, 0xb3, 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, + 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, + 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, + 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, + 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, + 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, + 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xb1, 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, + 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, + 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x66, 0x00, 0xed, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x69, 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0xf1, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, @@ -8290,92 +9076,129 @@ 0x65, 0xe2, 0x77, 0xe5, 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, - 0x30, 0x59, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, - 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, - 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, - 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x04, 0x1e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x58, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x3b, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, - 0x04, 0x52, 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x37, 0x04, 0x3d, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x5a, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x30, 0x04, 0x43, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x41, 0x04, 0x3a, 0x04, 0x38, - 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x32, 0x04, 0x30, 0x00, 0x00, + 0x30, 0x59, 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, + 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, + 0xc7, 0x40, 0x00, 0x20, 0xc8, 0x00, 0xc7, 0x91, + 0xad, 0x8c, 0x00, 0x20, 0xc8, 0x1c, 0xd5, 0x5c, + 0xc7, 0x3c, 0xb8, 0x5c, 0xbd, 0x80, 0xd1, 0x30, + 0x00, 0x20, 0xc7, 0x90, 0xc7, 0x20, 0xb8, 0x6d, + 0xc2, 0xb5, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x72, 0x00, 0xe5, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, + 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x68, 0x00, 0x75, 0x00, 0x6a, 0x00, 0x65, + 0x00, 0x20, 0x01, 0x7e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x3b, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, + 0x04, 0x52, 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x37, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x04, 0x45, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, + 0x04, 0x35, 0x04, 0x5a, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x30, 0x04, 0x43, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x41, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x32, 0x04, 0x30, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0xe5, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x6f, @@ -8421,6 +9244,10 @@ 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, 0x52, 0x36, 0x00, 0x00, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x51, 0x4d, 0x4e, 0x8e, 0x5d, 0xf2, + 0x77, 0xe5, 0x76, 0x84, 0x72, 0x48, 0x67, 0x43, + 0x96, 0x50, 0x52, 0x36, 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, @@ -8643,62 +9470,65 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x76, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x82, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x98, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa4, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xb8, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0xda, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xe8, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xee, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x04, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x96, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa2, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xb6, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0xd8, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xe6, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xec, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x4c, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, - 0x00, 0x30, 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, - 0x00, 0x41, 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x4c, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, + 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, + 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x01, 0x82, - 0x00, 0x00, 0x00, 0xd0, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xe4, 0x00, 0x00, 0x02, 0x52, + 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xe4, 0x00, 0x00, 0x02, 0x6a, 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x01, 0x6a, - 0x00, 0x00, 0x04, 0x36, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xd0, 0x00, 0x00, 0x05, 0xa0, + 0x00, 0x00, 0x04, 0x4e, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xd0, 0x00, 0x00, 0x05, 0xb8, 0x65, 0x6e, 0x47, 0x42, 0x00, 0x00, 0x01, 0x84, - 0x00, 0x00, 0x07, 0x70, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xe8, 0x00, 0x00, 0x08, 0xf4, + 0x00, 0x00, 0x07, 0x88, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xe8, 0x00, 0x00, 0x09, 0x0c, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x01, 0xd0, - 0x00, 0x00, 0x0a, 0xdc, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x92, 0x00, 0x00, 0x0c, 0xac, - 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x7a, - 0x00, 0x00, 0x0e, 0x3e, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x01, 0xc6, 0x00, 0x00, 0x0f, 0xb8, - 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x01, 0xa6, - 0x00, 0x00, 0x11, 0x7e, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x7c, 0x00, 0x00, 0x13, 0x24, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x01, 0x84, - 0x00, 0x00, 0x14, 0xa0, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x8c, 0x00, 0x00, 0x16, 0x24, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc2, - 0x00, 0x00, 0x17, 0xb0, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x19, 0x72, + 0x00, 0x00, 0x0a, 0xf4, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x0c, 0xc4, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x01, 0x92, + 0x00, 0x00, 0x0d, 0xa8, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x7a, 0x00, 0x00, 0x0f, 0x3a, + 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x01, 0xc6, + 0x00, 0x00, 0x10, 0xb4, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xa6, 0x00, 0x00, 0x12, 0x7a, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x7c, + 0x00, 0x00, 0x14, 0x20, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x84, 0x00, 0x00, 0x15, 0x9c, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8c, + 0x00, 0x00, 0x17, 0x20, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xc2, 0x00, 0x00, 0x18, 0xac, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x1a, 0x6e, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x1a, 0xdc, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, @@ -9078,469 +9908,511 @@ 0x00, 0x6f, 0x00, 0x72, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x2e, 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, + 0xc2, 0xdc, 0xd5, 0xd8, 0x00, 0x20, 0xd5, 0x04, + 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, + 0x00, 0x20, 0xbe, 0x44, 0xb5, 0x14, 0xc6, 0x24, + 0x00, 0x20, 0xce, 0x74, 0xb4, 0xdc, 0x00, 0x20, + 0xac, 0x80, 0xc0, 0xc9, 0x00, 0x20, 0xd1, 0x4c, + 0xc7, 0x74, 0xbe, 0x14, 0xc7, 0x44, 0x00, 0x20, + 0xb3, 0x00, 0xcc, 0xb4, 0xd5, 0x60, 0x00, 0x20, + 0xb5, 0x4c, 0x00, 0x20, 0xd6, 0x54, 0xba, 0x74, + 0xc5, 0xd0, 0x00, 0x20, 0xb0, 0x98, 0xd0, 0xc0, + 0xb0, 0x9c, 0x00, 0x20, 0xba, 0xa8, 0xb4, 0xe0, + 0x00, 0x20, 0xc0, 0xc9, 0xc0, 0xc1, 0xc7, 0x44, + 0x00, 0x20, 0xac, 0x70, 0xc7, 0x58, 0x00, 0x20, + 0xc2, 0xdc, 0xd3, 0x7c, 0xb7, 0xf0, 0xc0, 0xc9, + 0xc7, 0x3c, 0xb8, 0x5c, 0x00, 0x20, 0xb9, 0xcc, + 0xb4, 0xe4, 0x00, 0x20, 0xb5, 0x4c, 0x00, 0x20, + 0xd6, 0x5c, 0xc6, 0xa9, 0xd5, 0x69, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, 0xc0, 0xac, + 0xc6, 0xa9, 0xc7, 0x90, 0xb2, 0x94, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x44, 0x00, 0x20, + 0xd1, 0xb5, 0xd5, 0x74, 0x00, 0x20, 0xbc, 0xf4, + 0xc8, 0x15, 0x00, 0x20, 0xc1, 0x24, 0xc8, 0x15, + 0xc7, 0x44, 0x00, 0x20, 0xc8, 0x1c, 0xb3, 0x00, + 0xb8, 0x5c, 0x00, 0x20, 0xc8, 0x01, 0xc6, 0xa9, + 0xd5, 0x88, 0xb2, 0x94, 0xc9, 0xc0, 0x00, 0x20, + 0xd6, 0x55, 0xc7, 0x78, 0xd5, 0x60, 0x00, 0x20, + 0xc2, 0x18, 0x00, 0x20, 0xc7, 0x88, 0xc2, 0xb5, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x72, 0x00, 0x75, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe5, 0x00, 0x20, + 0x00, 0x67, 0x00, 0x6a, 0x00, 0xf8, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0xe5, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x6c, 0x00, 0xe5, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, + 0x00, 0xe5, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x72, 0x00, 0x75, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0xe5, 0x00, 0x20, 0x00, 0x67, 0x00, 0x6a, - 0x00, 0xf8, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0xe5, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, 0x00, 0x6c, - 0x00, 0xe5, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x20, 0x00, 0xe5, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x6b, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x73, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x20, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x67, 0x00, 0x6a, - 0x00, 0xf8, 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x72, 0x00, 0x75, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0xe5, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6b, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x72, 0x00, 0x75, 0x00, 0x6b, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x77, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x73, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x2c, 0x00, 0x20, 0x01, 0x7c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, 0x00, 0x73, - 0x00, 0x7a, 0x00, 0x79, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x6b, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6b, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x01, 0x05, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x7a, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x6a, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x6b, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x7a, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6d, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x6e, 0x01, 0x19, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x62, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x79, 0x00, 0x73, 0x00, 0x7a, - 0x00, 0x75, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x77, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x74, 0x00, 0x79, 0x00, 0x20, 0x00, 0x67, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x6a, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x55, - 0x00, 0x6d, 0x00, 0x6f, 0x01, 0x7c, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x77, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x77, 0x00, 0x64, 0x00, 0x7a, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x6e, 0x00, 0x6f, - 0x01, 0x5b, 0x00, 0x63, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x67, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x20, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x67, 0x00, 0x6a, 0x00, 0xf8, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x72, 0x00, 0x75, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0xe5, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x6a, 0x00, 0x69, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x75, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x7a, 0x00, 0x75, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x73, 0x00, 0x71, - 0x00, 0x75, 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x76, 0x00, 0xed, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x49, 0x00, 0x73, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x6d, 0x00, 0x69, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x75, 0x00, 0xe1, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x77, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x77, 0x00, 0x69, 0x00, 0x61, 0x00, 0x2c, + 0x00, 0x20, 0x01, 0x7c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x73, 0x00, 0x7a, 0x00, 0x79, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6b, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x73, 0x01, 0x05, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x7a, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x6a, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x62, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x6d, 0x00, 0x69, 0x00, 0x61, 0x00, 0x6e, + 0x01, 0x19, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x62, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, + 0x00, 0x73, 0x00, 0x7a, 0x00, 0x75, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x74, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6a, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x55, 0x00, 0x6d, 0x00, 0x6f, + 0x01, 0x7c, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, 0x00, 0x64, + 0x00, 0x7a, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, + 0x00, 0x6e, 0x00, 0x6f, 0x01, 0x5b, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0xe1, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x2e, 0x00, 0x00, 0x04, 0x2d, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x42, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x4b, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, - 0x04, 0x43, 0x04, 0x35, 0x04, 0x42, 0x04, 0x41, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x2c, 0x00, 0x20, - 0x04, 0x47, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x4b, 0x00, 0x20, 0x04, 0x41, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3b, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x32, 0x04, 0x41, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x4d, - 0x04, 0x3a, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x47, 0x04, 0x43, - 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x38, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x3c, 0x04, 0x38, 0x00, 0x2c, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x3c, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x4f, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, 0x04, 0x31, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x46, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, - 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x39, 0x00, 0x20, 0x00, 0x4c, 0x00, 0x55, - 0x00, 0x54, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x34, 0x04, 0x35, 0x04, 0x3e, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x40, 0x04, 0x42, 0x04, 0x4b, - 0x00, 0x2e, 0x00, 0x20, 0x04, 0x1e, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x37, - 0x04, 0x32, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4f, - 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x3b, 0x04, 0x4e, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x40, 0x04, 0x38, 0x04, 0x42, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3a, 0x04, 0x38, - 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3d, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, 0x04, 0x43, - 0x04, 0x47, 0x04, 0x38, 0x04, 0x3d, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x58, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x35, 0x04, 0x37, 0x04, 0x3d, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3b, 0x04, 0x30, - 0x04, 0x32, 0x04, 0x59, 0x04, 0x38, 0x04, 0x3c, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x5a, - 0x04, 0x30, 0x04, 0x58, 0x04, 0x43, 0x04, 0x5b, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, - 0x04, 0x31, 0x04, 0x35, 0x04, 0x3b, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x42, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x36, 0x04, 0x35, 0x04, 0x5a, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x40, 0x04, 0x42, 0x04, 0x38, - 0x04, 0x46, 0x04, 0x35, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x1e, 0x04, 0x32, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x43, 0x04, 0x5b, 0x04, 0x30, 0x04, 0x32, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x3a, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x35, - 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x3b, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x46, - 0x04, 0x38, 0x04, 0x58, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x32, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x3c, 0x04, 0x35, 0x04, 0x5a, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x30, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, - 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, - 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0xe5, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0xe5, 0x00, 0x67, - 0x00, 0x6f, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x6c, 0x00, 0xe5, 0x00, 0x20, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x6b, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x73, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0xe5, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0xe4, - 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x74, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x42, 0x00, 0x75, + 0x00, 0x61, 0x00, 0x63, 0x00, 0x6a, 0x00, 0x69, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x74, 0x01, 0x31, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, 0x00, 0x62, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x75, - 0x00, 0x6e, 0x00, 0x75, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x01, 0x1f, 0x00, 0x69, 0x01, 0x5f, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x74, - 0x00, 0xfc, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x7a, 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x76, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x79, 0x00, 0x61, 0x00, 0x70, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, - 0x01, 0x31, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x42, 0x00, 0x75, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x63, - 0x01, 0x31, 0x00, 0x79, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x79, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x75, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x6f, 0x01, 0x1f, 0x00, 0x72, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x20, 0x01, 0x5f, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x75, 0x00, 0x79, - 0x00, 0x67, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x73, - 0x01, 0x31, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x61, 0x01, 0x1f, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, - 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, - 0x04, 0x42, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0xe9, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x75, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x71, 0x00, 0x75, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, + 0x00, 0xed, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x49, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x69, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x71, + 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x75, + 0x00, 0xe1, 0x00, 0x72, 0x00, 0x69, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x71, + 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x61, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2e, + 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x37, 0x04, 0x43, 0x04, 0x35, + 0x04, 0x42, 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x47, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x4b, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3b, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x41, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x46, 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x4d, 0x04, 0x3a, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x47, 0x04, 0x43, 0x04, 0x42, 0x04, 0x4c, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x35, 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x38, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x3c, + 0x04, 0x38, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x3c, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x4f, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x42, + 0x04, 0x30, 0x04, 0x31, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x46, 0x04, 0x43, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, 0x00, 0x20, + 0x00, 0x4c, 0x00, 0x55, 0x00, 0x54, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x38, 0x04, 0x34, 0x04, 0x35, + 0x04, 0x3e, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x40, + 0x04, 0x42, 0x04, 0x4b, 0x00, 0x2e, 0x00, 0x20, + 0x04, 0x1e, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x3e, 0x04, 0x37, 0x04, 0x32, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x4f, 0x04, 0x35, 0x04, 0x42, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3b, + 0x04, 0x4e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x4c, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x3c, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x3a, 0x04, 0x38, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x43, - 0x04, 0x54, 0x04, 0x42, 0x04, 0x4c, 0x04, 0x41, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, - 0x04, 0x34, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x32, 0x04, 0x41, - 0x04, 0x56, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x3c, 0x00, 0x20, + 0x04, 0x31, 0x04, 0x3d, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x43, 0x04, 0x47, 0x04, 0x38, + 0x04, 0x3d, 0x04, 0x38, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x32, 0x04, 0x35, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x56, 0x00, 0x20, 0x04, 0x42, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x45, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x38, 0x04, 0x3d, 0x04, 0x4e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x56, 0x04, 0x34, 0x04, 0x42, 0x04, 0x56, - 0x04, 0x3d, 0x04, 0x3a, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x3c, 0x04, 0x56, 0x04, 0x3d, - 0x04, 0x3e, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x42, - 0x04, 0x30, 0x04, 0x31, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x46, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x48, 0x04, 0x43, 0x04, 0x3a, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x56, 0x04, 0x32, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x56, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3e, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x40, 0x04, 0x42, - 0x04, 0x3a, 0x04, 0x38, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x1f, 0x04, 0x40, 0x04, 0x38, 0x04, 0x37, - 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x35, 0x04, 0x40, 0x04, 0x35, 0x04, 0x32, - 0x04, 0x56, 0x04, 0x40, 0x04, 0x3a, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, + 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x3b, 0x04, 0x30, 0x04, 0x32, 0x04, 0x59, + 0x04, 0x38, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x35, 0x04, 0x5a, 0x04, 0x30, 0x04, 0x58, + 0x04, 0x43, 0x04, 0x5b, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x30, 0x04, 0x31, 0x04, 0x35, + 0x04, 0x3b, 0x04, 0x43, 0x00, 0x20, 0x04, 0x42, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, + 0x04, 0x5a, 0x04, 0x30, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x40, + 0x04, 0x42, 0x04, 0x38, 0x04, 0x46, 0x04, 0x35, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x1e, 0x04, 0x32, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x43, 0x04, 0x5b, + 0x04, 0x30, 0x04, 0x32, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x3a, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x40, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x46, 0x04, 0x38, 0x04, 0x58, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x35, + 0x04, 0x5a, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x30, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x73, 0x00, 0x20, 0x00, 0x66, + 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, 0x00, 0x67, + 0x00, 0xf6, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x70, 0x00, 0xe5, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0xe5, 0x00, 0x67, 0x00, 0x6f, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x6c, 0x00, 0xe5, + 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6a, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x67, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x67, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x44, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0xe5, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0xe4, 0x00, 0x6d, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x6b, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x42, 0x00, 0x75, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x74, 0x01, 0x31, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x62, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x01, 0x1f, + 0x00, 0x69, 0x01, 0x5f, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x74, 0x00, 0xfc, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x79, 0x00, 0x61, + 0x00, 0x70, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, + 0x01, 0x31, 0x00, 0x6c, 0x01, 0x31, 0x00, 0x72, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x42, 0x00, 0x75, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, + 0x01, 0x31, 0x00, 0x63, 0x01, 0x31, 0x00, 0x79, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x79, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x75, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x6b, 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, + 0x01, 0x1f, 0x00, 0x72, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, + 0x01, 0x5f, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x79, 0x00, 0x67, 0x00, 0x75, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x73, 0x01, 0x31, 0x00, 0x6e, + 0x01, 0x31, 0x00, 0x20, 0x00, 0x73, 0x00, 0x61, + 0x01, 0x1f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x2e, 0x00, 0x00, 0x04, 0x26, 0x04, 0x35, + 0x04, 0x39, 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, + 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x43, 0x04, 0x54, 0x04, 0x42, + 0x04, 0x4c, 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x34, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x41, 0x04, 0x56, 0x04, 0x3c, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, - 0x04, 0x3b, 0x04, 0x35, 0x04, 0x36, 0x04, 0x3d, - 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x30, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x41, 0x04, 0x43, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3b, 0x04, 0x56, 0x04, 0x31, - 0x04, 0x40, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x2e, - 0x00, 0x00, 0x6b, 0x64, 0x6e, 0x2c, 0x8a, 0x66, - 0x75, 0x28, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, - 0x67, 0x03, 0x4f, 0xee, 0x65, 0x39, 0x98, 0x6f, - 0x79, 0x3a, 0x53, 0x61, 0x67, 0xe5, 0x62, 0x7e, - 0x88, 0x68, 0xff, 0x0c, 0x85, 0xc9, 0x6b, 0x64, - 0x8b, 0x93, 0x87, 0xa2, 0x5e, 0x55, 0x4e, 0x0a, - 0x76, 0x84, 0x62, 0x40, 0x67, 0x09, 0x82, 0x72, - 0x5f, 0x69, 0x77, 0x0b, 0x8d, 0x77, 0x4f, 0x86, - 0x4e, 0x9b, 0x5f, 0xae, 0x50, 0x4f, 0x85, 0xcd, - 0x30, 0x02, 0x90, 0x19, 0x53, 0xef, 0x8b, 0x93, - 0x4f, 0x7f, 0x75, 0x28, 0x80, 0x05, 0x6a, 0xa2, - 0x67, 0xe5, 0x68, 0x21, 0x6e, 0x96, 0x66, 0x2f, - 0x54, 0x26, 0x5d, 0xf2, 0x6b, 0x63, 0x78, 0xba, - 0x59, 0x57, 0x75, 0x28, 0x30, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x4e, 0x54, 0x53, 0x43, 0x2d, 0x52, 0x47, 0x42, - 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x28, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x24, 0x28, 0x6c, 0x63, 0x6d, 0x73, + 0x00, 0x20, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x56, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x45, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x41, 0x04, 0x38, + 0x04, 0x3d, 0x04, 0x4e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x56, 0x04, 0x34, + 0x04, 0x42, 0x04, 0x56, 0x04, 0x3d, 0x04, 0x3a, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x37, 0x04, 0x3c, + 0x04, 0x56, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x4e, + 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, 0x04, 0x31, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x46, 0x04, 0x4c, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x48, + 0x04, 0x43, 0x04, 0x3a, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, 0x04, 0x32, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x56, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x3e, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x40, 0x04, 0x42, 0x04, 0x3a, 0x04, 0x38, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x1f, 0x04, 0x40, + 0x04, 0x38, 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, + 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x35, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x32, 0x04, 0x56, 0x04, 0x40, + 0x04, 0x3a, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x47, 0x04, 0x35, 0x04, 0x3c, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x35, + 0x04, 0x36, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x45, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3b, + 0x04, 0x56, 0x04, 0x31, 0x04, 0x40, 0x04, 0x43, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, + 0x04, 0x4f, 0x00, 0x2e, 0x00, 0x00, 0x6b, 0x64, + 0x6e, 0x2c, 0x8a, 0x66, 0x75, 0x28, 0x63, 0xcf, + 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x03, 0x4f, 0xee, + 0x65, 0x39, 0x98, 0x6f, 0x79, 0x3a, 0x53, 0x61, + 0x67, 0xe5, 0x62, 0x7e, 0x88, 0x68, 0xff, 0x0c, + 0x85, 0xc9, 0x6b, 0x64, 0x8b, 0x93, 0x87, 0xa2, + 0x5e, 0x55, 0x4e, 0x0a, 0x76, 0x84, 0x62, 0x40, + 0x67, 0x09, 0x82, 0x72, 0x5f, 0x69, 0x77, 0x0b, + 0x8d, 0x77, 0x4f, 0x86, 0x4e, 0x9b, 0x5f, 0xae, + 0x50, 0x4f, 0x85, 0xcd, 0x30, 0x02, 0x90, 0x19, + 0x53, 0xef, 0x8b, 0x93, 0x4f, 0x7f, 0x75, 0x28, + 0x80, 0x05, 0x6a, 0xa2, 0x67, 0xe5, 0x68, 0x21, + 0x6e, 0x96, 0x66, 0x2f, 0x54, 0x26, 0x5d, 0xf2, + 0x6b, 0x63, 0x78, 0xba, 0x59, 0x57, 0x75, 0x28, + 0x30, 0x02, 0x00, 0x00, 0x8b, 0xe5, 0x6d, 0x4b, + 0x8b, 0xd5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x90, 0x1a, 0x8f, 0xc7, 0x53, 0xd8, + 0x66, 0xf4, 0x89, 0xc6, 0x98, 0x91, 0x53, 0x61, + 0x67, 0xe5, 0x8b, 0xe2, 0x88, 0x68, 0xff, 0x0c, + 0x53, 0xef, 0x8b, 0xa9, 0x66, 0x3e, 0x79, 0x3a, + 0x56, 0x68, 0x4e, 0x0a, 0x66, 0x3e, 0x79, 0x3a, + 0x76, 0x84, 0x62, 0x40, 0x67, 0x09, 0x98, 0x9c, + 0x82, 0x72, 0x90, 0xfd, 0x8f, 0x7b, 0x5f, 0xae, + 0x53, 0xd1, 0x84, 0xdd, 0x30, 0x02, 0x8f, 0xd9, + 0x53, 0xef, 0x8b, 0xa9, 0x75, 0x28, 0x62, 0x37, + 0x68, 0xc0, 0x67, 0xe5, 0x68, 0x21, 0x6b, 0x63, + 0x66, 0x2f, 0x54, 0x26, 0x5d, 0xf2, 0x6b, 0x63, + 0x78, 0x6e, 0x5e, 0x94, 0x75, 0x28, 0x30, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x4e, 0x54, 0x53, 0x43, + 0x2d, 0x52, 0x47, 0x42, 0x2e, 0x69, 0x63, 0x63, + 0x78, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x27, 0x78, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x33, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1e, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0x73, 0x8e, 0xc5, 0x25, - 0xb5, 0x9a, 0xd0, 0x85, 0x9d, 0xec, 0x30, 0x4c, - 0x96, 0x33, 0x7e, 0xb0, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0xa8, 0x52, 0xac, 0x11, + 0x8d, 0x7b, 0x71, 0xd6, 0xb9, 0x8c, 0x8a, 0x47, + 0x70, 0x3b, 0x9e, 0x97, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x2e, 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x50, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0a, 0x64, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0a, 0x78, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0c, 0xd4, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0xe8, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xa4, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0a, 0xb8, + 0x00, 0x00, 0x0d, 0x14, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0d, 0x28, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xcc, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe0, + 0x00, 0x00, 0x0d, 0x3c, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x50, 0x00, 0x00, 0x00, 0x10, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0a, 0xe0, 0x00, 0x00, 0x00, 0x10, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe0, + 0x00, 0x00, 0x0d, 0x50, 0x00, 0x00, 0x00, 0x10, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x50, 0x00, 0x00, 0x00, 0x10, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0a, 0xf0, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0b, 0x14, - 0x00, 0x00, 0x01, 0x90, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x0c, 0xa4, 0x00, 0x00, 0x17, 0x84, + 0x00, 0x00, 0x0d, 0x60, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0d, 0x84, + 0x00, 0x00, 0x01, 0x8e, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x0f, 0x14, 0x00, 0x00, 0x18, 0x64, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x12, @@ -9548,34 +10420,43 @@ 0x00, 0x53, 0x00, 0x43, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x6a, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x52, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x01, 0xcc, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0x48, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, - 0x00, 0x00, 0x02, 0xf8, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x76, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x9a, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x02, 0x14, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x02, 0x82, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x02, 0xfe, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xae, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x03, 0xe6, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x04, 0x5a, + 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0xd2, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x05, 0xfa, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x06, 0x28, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0x5c, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x05, 0x80, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x05, 0xf4, + 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x06, 0x7a, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x07, 0x02, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x07, 0x7c, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0xee, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x08, 0x7e, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x08, 0xf8, + 0x00, 0x00, 0x08, 0x56, 0x73, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x08, 0xde, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x09, 0x52, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x09, 0xcc, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x0a, 0x3e, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x0a, 0xce, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x0b, 0x48, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -9604,70 +10485,98 @@ 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, - 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, - 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, - 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, - 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x72, 0x00, 0xe6, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, - 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x7a, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x7a, 0x01, 0x51, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, + 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, + 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, + 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, + 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0xed, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0xf1, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x7a, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x7a, 0x01, 0x51, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x67, 0x00, 0x6b, 0x00, 0xf6, 0x00, 0x74, 0x00, 0xe9, 0x00, 0x73, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x74, @@ -9707,70 +10616,107 @@ 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, 0x30, 0x59, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x00, 0xc7, 0x91, 0xad, 0x8c, 0x00, 0x20, + 0xc8, 0x1c, 0xd5, 0x5c, 0xc7, 0x3c, 0xb8, 0x5c, + 0xbd, 0x80, 0xd1, 0x30, 0x00, 0x20, 0xc7, 0x90, + 0xc7, 0x20, 0xb8, 0x6d, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x01, 0x7e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xfd, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, @@ -9837,7 +10783,11 @@ 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, - 0x52, 0x36, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, + 0x52, 0x36, 0x00, 0x00, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x51, 0x4d, + 0x4e, 0x8e, 0x5d, 0xf2, 0x77, 0xe5, 0x76, 0x84, + 0x72, 0x48, 0x67, 0x43, 0x96, 0x50, 0x52, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, 0x00, 0x00, 0x00, 0x00, @@ -9863,440 +10813,468 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x96, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa2, - 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xca, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd2, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe8, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf4, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x08, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x2a, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x46, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x01, 0x56, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x64, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x6a, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x80, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xc8, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd0, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe6, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf2, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x06, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x28, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x44, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x01, 0x54, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x62, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x68, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x7e, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x47, - 0x00, 0x41, 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, - 0x00, 0x5f, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x29, 0x00, 0x30, - 0x00, 0x2e, 0x00, 0x38, 0x00, 0x38, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, - 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x47, 0x00, 0x41, + 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, 0x00, 0x5f, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x29, 0x00, 0x30, 0x00, 0x2e, + 0x00, 0x38, 0x00, 0x38, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, + 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, + 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, + 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x01, 0x88, 0x00, 0x00, 0x00, 0xc4, + 0x00, 0x00, 0x01, 0x88, 0x00, 0x00, 0x00, 0xd0, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0x6e, - 0x00, 0x00, 0x02, 0x4c, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xa2, 0x00, 0x00, 0x03, 0xba, + 0x00, 0x00, 0x02, 0x58, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xa2, 0x00, 0x00, 0x03, 0xc6, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, - 0x00, 0x00, 0x05, 0x5c, 0x65, 0x6e, 0x47, 0x42, - 0x00, 0x00, 0x01, 0x8a, 0x00, 0x00, 0x07, 0x64, + 0x00, 0x00, 0x05, 0x68, 0x65, 0x6e, 0x47, 0x42, + 0x00, 0x00, 0x01, 0x8a, 0x00, 0x00, 0x07, 0x70, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb4, - 0x00, 0x00, 0x08, 0xee, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x7c, 0x00, 0x00, 0x0a, 0xa2, - 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x01, 0xa4, - 0x00, 0x00, 0x0c, 0x1e, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x01, 0x86, 0x00, 0x00, 0x0d, 0xc2, - 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x01, 0xaa, - 0x00, 0x00, 0x0f, 0x48, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x88, 0x00, 0x00, 0x10, 0xf2, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8a, - 0x00, 0x00, 0x12, 0x7a, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x66, 0x00, 0x00, 0x14, 0x04, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x01, 0x92, - 0x00, 0x00, 0x15, 0x6a, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x16, 0xfc, - 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x00, 0x08, 0xfa, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x7c, 0x00, 0x00, 0x0a, 0xae, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, + 0x00, 0x00, 0x0c, 0x2a, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xa4, 0x00, 0x00, 0x0c, 0xfe, + 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x01, 0x86, + 0x00, 0x00, 0x0e, 0xa2, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xaa, 0x00, 0x00, 0x10, 0x28, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, + 0x00, 0x00, 0x11, 0xd2, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x8a, 0x00, 0x00, 0x13, 0x5a, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x66, + 0x00, 0x00, 0x14, 0xe4, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x92, 0x00, 0x00, 0x16, 0x4a, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x88, + 0x00, 0x00, 0x17, 0xdc, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x69, 0x00, 0x74, 0x00, 0x68, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x68, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, 0x00, 0x4e, - 0x00, 0x54, 0x00, 0x53, 0x00, 0x43, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x49, 0x00, 0x74, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x70, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x54, - 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x59, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x76, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x75, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x7a, 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x76, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x75, 0x01, 0x7e, 0x00, 0x69, - 0x00, 0x74, 0x00, 0xfd, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x4e, 0x00, 0x54, 0x00, 0x53, + 0x00, 0x43, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x54, - 0x00, 0x53, 0x00, 0x43, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x44, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0x69, 0x01, 0x7e, 0x00, 0x20, - 0x00, 0x7a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0xfd, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x79, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x68, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x54, - 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x6d, 0x01, 0x1b, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x62, 0x00, 0xfd, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x75, - 0x01, 0x7e, 0x00, 0x69, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x7a, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0xf3, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x76, 0x00, 0xe1, 0x00, 0x6e, 0x00, 0xed, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, 0x00, 0x6e, - 0x00, 0xed, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x74, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x46, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x54, - 0x00, 0x53, 0x00, 0x43, 0x00, 0x20, 0x00, 0x56, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x49, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x62, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x53, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x54, - 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x45, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x75, 0x00, 0x72, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x75, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x44, - 0x00, 0x65, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x53, + 0x00, 0x4d, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, + 0x00, 0x43, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x59, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x68, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x6c, 0x00, 0x79, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x56, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x77, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x65, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x2e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xba, - 0x03, 0xb1, 0x03, 0xb8, 0x03, 0xbf, 0x03, 0xc1, - 0x03, 0xaf, 0x03, 0xb6, 0x03, 0xb5, 0x03, 0xb9, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x75, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x7a, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x68, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x76, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x75, + 0x01, 0x7e, 0x00, 0x69, 0x00, 0x74, 0x00, 0xfd, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x4e, 0x00, 0x54, 0x00, 0x53, 0x00, 0x43, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x69, + 0x01, 0x7e, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0xfd, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x68, 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x53, + 0x00, 0x4d, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, + 0x00, 0x43, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x6d, + 0x01, 0x1b, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0xfd, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x75, 0x01, 0x7e, 0x00, 0x69, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x75, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x6b, 0x00, 0xf3, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x76, 0x00, 0xe1, + 0x00, 0x6e, 0x00, 0xed, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, + 0x00, 0x76, 0x00, 0x6e, 0x00, 0xed, 0x00, 0x68, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x61, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x46, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x62, 0x00, 0x62, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x4e, 0x00, 0x54, 0x00, 0x53, 0x00, 0x43, + 0x00, 0x20, 0x00, 0x56, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x72, 0x00, 0x64, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x44, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x53, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x77, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x53, + 0x00, 0x4d, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, + 0x00, 0x43, 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x74, 0x00, 0x7a, + 0x00, 0x74, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x75, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x44, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x56, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x77, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x77, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x2e, 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, + 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, + 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, + 0x00, 0x20, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb8, + 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xaf, 0x03, 0xb6, + 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xcd, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x20, + 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xc9, 0x03, 0xbc, + 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xc5, + 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xb7, + 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbc, 0x03, 0xbf, + 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb9, 0x03, 0xbf, + 0x03, 0xcd, 0x03, 0xbd, 0x03, 0xc4, 0x03, 0xb1, + 0x03, 0xb9, 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xb5, 0x03, 0xcd, 0x03, 0xc1, 0x03, 0xbf, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xc9, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, - 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, - 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x20, 0x03, 0xc7, + 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xcc, 0x03, 0xc4, + 0x03, 0xc5, 0x03, 0xc0, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb2, 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xc4, + 0x03, 0xb5, 0x03, 0xbf, 0x00, 0x20, 0x00, 0x4e, + 0x00, 0x54, 0x00, 0x53, 0x00, 0x43, 0x00, 0x2e, + 0x00, 0x20, 0x03, 0x95, 0x03, 0xaf, 0x03, 0xbd, + 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xad, + 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xbe, + 0x03, 0xb5, 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, + 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xad, + 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xcc, 0x03, 0xc4, 0x03, 0xc5, + 0x03, 0xc0, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x20, 0x03, 0xad, + 0x03, 0xc7, 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xbd, 0x03, 0xc4, 0x03, 0xb9, + 0x03, 0xba, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xb8, + 0x03, 0xb5, 0x03, 0xaf, 0x00, 0x20, 0x03, 0xb1, + 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xbf, 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, + 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, + 0x00, 0x2e, 0x00, 0x20, 0x03, 0x98, 0x03, 0xb1, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xad, + 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, - 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xbd, - 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, - 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xb9, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xc4, + 0x03, 0xb5, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc5, + 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, - 0x03, 0xcc, 0x03, 0xc4, 0x03, 0xc5, 0x03, 0xc0, - 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb2, 0x03, 0xaf, + 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, + 0x00, 0x20, 0x03, 0xbc, 0x03, 0xcc, 0x03, 0xbd, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xb9, + 0x03, 0xb1, 0x00, 0x20, 0x03, 0xbd, 0x03, 0xb1, + 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xbf, + 0x03, 0xba, 0x03, 0xc9, 0x03, 0xb4, 0x03, 0xb9, + 0x03, 0xba, 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, + 0x03, 0xb9, 0x03, 0xae, 0x03, 0xc3, 0x03, 0xb5, + 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xb1, + 0x03, 0xc1, 0x03, 0xc7, 0x03, 0xb5, 0x03, 0xb9, + 0x03, 0xbf, 0x03, 0xb8, 0x03, 0xb5, 0x03, 0xc4, + 0x03, 0xb7, 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, + 0x03, 0xb1, 0x00, 0x20, 0x03, 0xb2, 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xc4, 0x03, 0xb5, 0x03, 0xbf, - 0x00, 0x20, 0x00, 0x4e, 0x00, 0x54, 0x00, 0x53, - 0x00, 0x43, 0x00, 0x2e, 0x00, 0x20, 0x03, 0x95, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xbe, 0x03, 0xb5, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb1, 0x03, 0xc3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xcc, - 0x03, 0xc4, 0x03, 0xc5, 0x03, 0xc0, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xc5, - 0x00, 0x20, 0x03, 0xad, 0x03, 0xc7, 0x03, 0xb5, - 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xbd, - 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xc4, 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xc4, - 0x03, 0xb1, 0x03, 0xb8, 0x03, 0xb5, 0x03, 0xaf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x54, + 0x00, 0x53, 0x00, 0x43, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x49, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x20, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x79, 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, 0x00, 0x2e, 0x00, 0x20, - 0x03, 0x98, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xad, 0x03, 0xc0, 0x03, 0xb5, - 0x03, 0xb9, 0x00, 0x20, 0x03, 0xbd, 0x03, 0xb1, - 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xb7, - 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbc, 0x03, 0xbf, - 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb9, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, - 0x03, 0xb1, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xbc, - 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xb3, 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, - 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xba, 0x03, 0xc9, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xbf, - 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb9, 0x03, 0xae, - 0x03, 0xc3, 0x03, 0xb5, 0x03, 0xc4, 0x03, 0xb5, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc1, 0x03, 0xc7, - 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xb8, - 0x03, 0xb5, 0x03, 0xc4, 0x03, 0xb7, 0x03, 0xbc, - 0x03, 0xad, 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, - 0x03, 0xb2, 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xc4, - 0x03, 0xb5, 0x03, 0xbf, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x59, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x68, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x6c, 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x67, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x4e, 0x00, 0x54, 0x00, 0x53, 0x00, 0x43, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x49, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x68, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x68, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x70, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, - 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x59, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x73, 0x00, 0x68, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x64, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6c, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0xe1, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x4e, 0x00, 0x54, 0x00, 0x53, 0x00, 0x43, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0xe1, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x71, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, 0x00, 0x68, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x70, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, - 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x62, 0x00, 0x65, 0x00, 0x72, - 0x00, 0xed, 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x61, 0x00, 0x72, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x69, 0x00, 0x76, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x00, 0x00, 0x51, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x63, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6c, 0x00, 0x27, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x76, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x4e, 0x00, 0x54, 0x00, 0x53, 0x00, 0x43, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x75, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x53, - 0x00, 0x4d, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, - 0x00, 0x43, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x55, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x54, + 0x00, 0x53, 0x00, 0x43, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x68, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x65, + 0x00, 0x6d, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x7a, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x53, 0x00, 0x4d, 0x00, 0x54, 0x00, 0x45, + 0x00, 0x2d, 0x00, 0x43, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x72, 0x00, 0xed, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x51, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x27, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x76, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x54, + 0x00, 0x53, 0x00, 0x43, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x75, 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x54, + 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x55, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x71, + 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x00, 0xc7, 0x74, + 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, + 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, 0x00, 0x4e, + 0x00, 0x54, 0x00, 0x53, 0x00, 0x43, 0x00, 0x20, + 0xbe, 0x44, 0xb5, 0x14, 0xc6, 0x24, 0x00, 0x20, + 0xd4, 0x5c, 0xc9, 0x00, 0xc5, 0xd0, 0xc1, 0x1c, + 0x00, 0x20, 0xc0, 0xac, 0xc6, 0xa9, 0xd5, 0x58, + 0xb2, 0x94, 0x00, 0x20, 0xc0, 0xc9, 0xc0, 0xc1, + 0x00, 0x20, 0xbc, 0x94, 0xc7, 0x04, 0xb9, 0x7c, + 0x00, 0x20, 0xc8, 0x15, 0xc7, 0x58, 0xd5, 0x69, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x54, + 0x00, 0x45, 0x00, 0x2d, 0x00, 0x43, 0xb8, 0x5c, + 0x00, 0x20, 0xb3, 0x00, 0xcc, 0xb4, 0xb4, 0x18, + 0xc5, 0xb4, 0x00, 0x20, 0xc6, 0x24, 0xb7, 0x98, + 0xb4, 0x1c, 0xcc, 0x44, 0xb8, 0x5c, 0x00, 0x20, + 0xbc, 0x29, 0xce, 0x58, 0xb4, 0x1c, 0x00, 0x20, + 0xd4, 0x5c, 0xc9, 0x00, 0xc7, 0x85, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, 0xb3, 0xd9, + 0xc6, 0x01, 0xc0, 0xc1, 0x00, 0x20, 0xae, 0x30, + 0xb8, 0x5d, 0xbb, 0x3c, 0xc7, 0x44, 0x00, 0x20, + 0xb5, 0x14, 0xcf, 0x54, 0xb5, 0x29, 0xd5, 0x60, + 0x00, 0x20, 0xb5, 0x4c, 0xb9, 0xcc, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x44, 0x00, 0x20, + 0xd6, 0x5c, 0xc6, 0xa9, 0xd5, 0x74, 0xc5, 0x7c, + 0xd5, 0x69, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, @@ -11183,78 +12161,87 @@ 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x43, 0x49, 0x45, 0x2d, 0x52, 0x47, 0x42, 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x08, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x20, 0x08, 0x6c, 0x63, 0x6d, 0x73, + 0xf4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x24, 0xf4, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x31, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1c, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0x35, 0x5a, 0x8e, 0x31, - 0x5b, 0xf1, 0x82, 0xbd, 0x5d, 0x32, 0x94, 0x1a, - 0x87, 0xe5, 0x85, 0xb7, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0xaa, 0xee, 0x10, 0x82, + 0x38, 0xaf, 0x1c, 0xcb, 0x13, 0x10, 0x08, 0xdd, + 0x78, 0x55, 0xdc, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x2c, 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x4c, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0a, 0x60, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0a, 0x74, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0c, 0xd0, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0xe4, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xa0, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0a, 0xb4, + 0x00, 0x00, 0x0d, 0x10, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0d, 0x24, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xc8, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xdc, + 0x00, 0x00, 0x0d, 0x38, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x4c, 0x00, 0x00, 0x00, 0x10, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0a, 0xdc, 0x00, 0x00, 0x00, 0x10, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xdc, + 0x00, 0x00, 0x0d, 0x4c, 0x00, 0x00, 0x00, 0x10, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x4c, 0x00, 0x00, 0x00, 0x10, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0a, 0xec, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0b, 0x10, - 0x00, 0x00, 0x01, 0x8e, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x0c, 0xa0, 0x00, 0x00, 0x13, 0x68, + 0x00, 0x00, 0x0d, 0x5c, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0d, 0x80, + 0x00, 0x00, 0x01, 0x8c, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x0f, 0x0c, 0x00, 0x00, 0x15, 0xe8, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x43, 0x00, 0x49, 0x00, 0x45, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0xe8, + 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x01, 0x52, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x01, 0xcc, - 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, - 0x00, 0x00, 0x02, 0x48, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x02, 0xf8, + 0x00, 0x00, 0x01, 0x9a, 0x64, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x02, 0x14, + 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, + 0x00, 0x00, 0x02, 0x82, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0xfe, + 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, + 0x00, 0x00, 0x03, 0xae, 0x67, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, - 0x00, 0x00, 0x03, 0x76, 0x69, 0x64, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x03, 0xe6, + 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, - 0x00, 0x00, 0x04, 0x5a, 0x6a, 0x61, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x04, 0xd2, - 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, - 0x00, 0x00, 0x05, 0x00, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x05, 0x80, + 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x05, 0xfa, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, + 0x00, 0x00, 0x06, 0x28, 0x6e, 0x62, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0x5c, + 0x6e, 0x62, 0x4e, 0x4f, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x00, 0x86, - 0x00, 0x00, 0x05, 0xf4, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x06, 0x7a, - 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x07, 0x02, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x07, 0x7c, - 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, - 0x00, 0x00, 0x07, 0xee, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x08, 0x7e, - 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, - 0x00, 0x00, 0x08, 0xf8, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x08, 0x56, + 0x73, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, + 0x00, 0x00, 0x08, 0xde, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x09, 0x52, + 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x09, 0xcc, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x0a, 0x3e, + 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x0a, 0xce, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0b, 0x48, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0x1e, + 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, @@ -11283,58 +12270,86 @@ 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x79, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, 0x00, 0x7a, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x6b, - 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, - 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, - 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, 0x03, 0xbb, - 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, 0x03, 0xad, - 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xc3, - 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, - 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb9, - 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbd, - 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb1, - 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xce, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, 0x03, 0xc9, - 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, - 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, + 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x62, 0x00, 0x65, 0x00, 0x67, + 0x00, 0x72, 0x00, 0xe6, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x68, 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, + 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, + 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, + 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xb1, 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, + 0x03, 0xb3, 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, + 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, + 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, + 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, + 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, + 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, + 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xb1, 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, + 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, + 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x66, 0x00, 0xed, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x69, 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0xf1, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, @@ -11385,71 +12400,108 @@ 0x65, 0xe2, 0x77, 0xe5, 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, - 0x30, 0x59, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, - 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, - 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x30, 0x59, 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, + 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, + 0xc7, 0x40, 0x00, 0x20, 0xc8, 0x00, 0xc7, 0x91, + 0xad, 0x8c, 0x00, 0x20, 0xc8, 0x1c, 0xd5, 0x5c, + 0xc7, 0x3c, 0xb8, 0x5c, 0xbd, 0x80, 0xd1, 0x30, + 0x00, 0x20, 0xc7, 0x90, 0xc7, 0x20, 0xb8, 0x6d, + 0xc2, 0xb5, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, + 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, - 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x04, 0x1e, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x68, 0x00, 0x75, 0x00, 0x6a, 0x00, 0x65, + 0x00, 0x20, 0x01, 0x7e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x58, @@ -11516,6 +12568,10 @@ 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, 0x52, 0x36, 0x00, 0x00, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x51, 0x4d, 0x4e, 0x8e, 0x5d, 0xf2, + 0x77, 0xe5, 0x76, 0x84, 0x72, 0x48, 0x67, 0x43, + 0x96, 0x50, 0x52, 0x36, 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, @@ -11541,78 +12597,82 @@ 0x64, 0x69, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x28, - 0x00, 0x00, 0x00, 0xca, 0x00, 0x00, 0x00, 0x08, - 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x00, 0xe8, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00, 0x22, - 0x00, 0x00, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x1c, - 0x00, 0x00, 0x01, 0x46, 0x00, 0x00, 0x00, 0x0e, - 0x00, 0x00, 0x01, 0x54, 0x00, 0x00, 0x00, 0x0e, - 0x00, 0x00, 0x01, 0x62, 0x00, 0x00, 0x00, 0x06, - 0x00, 0x00, 0x01, 0x68, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0x7e, 0x00, 0x00, 0x00, 0x10, + 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0a, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x28, + 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x08, + 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x16, + 0x00, 0x00, 0x00, 0xe6, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0xf2, 0x00, 0x00, 0x00, 0x14, + 0x00, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x22, + 0x00, 0x00, 0x01, 0x28, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x01, 0x44, 0x00, 0x00, 0x00, 0x0e, + 0x00, 0x00, 0x01, 0x52, 0x00, 0x00, 0x00, 0x0e, + 0x00, 0x00, 0x01, 0x60, 0x00, 0x00, 0x00, 0x06, + 0x00, 0x00, 0x01, 0x66, 0x00, 0x00, 0x00, 0x16, + 0x00, 0x00, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x31, - 0x00, 0x2e, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, - 0x00, 0x31, 0x00, 0x47, 0x00, 0x41, 0x00, 0x4d, - 0x00, 0x55, 0x00, 0x54, 0x00, 0x5f, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00, 0x28, - 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, - 0x00, 0x29, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x39, - 0x00, 0x36, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, - 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, 0x00, 0x74, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, 0x00, 0x4d, - 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, 0x00, 0x63, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, 0x00, 0x41, - 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, 0x00, 0x52, - 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, - 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, - 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x00, - 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0c, - 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x01, 0x30, - 0x00, 0x00, 0x00, 0xc4, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xf6, 0x00, 0x00, 0x01, 0xf4, + 0x00, 0x2e, 0x00, 0x33, 0x00, 0x2e, 0x00, 0x32, + 0x00, 0x47, 0x00, 0x41, 0x00, 0x4d, 0x00, 0x55, + 0x00, 0x54, 0x00, 0x5f, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x28, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, 0x00, 0x29, + 0x00, 0x30, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x36, + 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x75, 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, + 0x00, 0x5f, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x64, 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x2d, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x53, 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, + 0x00, 0x44, 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, + 0x00, 0x5f, 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, + 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x64, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, + 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, + 0x00, 0x00, 0x01, 0x30, 0x00, 0x00, 0x00, 0xe8, + 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, + 0x00, 0x00, 0x02, 0x18, 0x64, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x4a, 0x00, 0x00, 0x03, 0x0e, 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, - 0x00, 0x00, 0x02, 0xea, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x62, 0x00, 0x00, 0x04, 0x6a, + 0x00, 0x00, 0x04, 0x58, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x62, 0x00, 0x00, 0x05, 0xd8, 0x65, 0x6e, 0x47, 0x42, 0x00, 0x00, 0x01, 0x32, - 0x00, 0x00, 0x05, 0xcc, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x06, 0xfe, + 0x00, 0x00, 0x07, 0x3a, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x08, 0x6c, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x01, 0x76, - 0x00, 0x00, 0x08, 0x3e, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x58, 0x00, 0x00, 0x09, 0xb4, - 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x01, 0x60, - 0x00, 0x00, 0x0b, 0x0c, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x86, 0x00, 0x00, 0x0c, 0x6c, - 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x4a, - 0x00, 0x00, 0x0d, 0xf2, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x3e, 0x00, 0x00, 0x0f, 0x3c, - 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3c, - 0x00, 0x00, 0x10, 0x7a, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x58, 0x00, 0x00, 0x11, 0xb6, - 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x5a, - 0x00, 0x00, 0x13, 0x0e, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x00, 0x09, 0xac, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x0b, 0x22, + 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x58, + 0x00, 0x00, 0x0b, 0xe0, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x01, 0x60, 0x00, 0x00, 0x0d, 0x38, + 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x01, 0x86, + 0x00, 0x00, 0x0e, 0x98, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x4a, 0x00, 0x00, 0x10, 0x1e, + 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, + 0x00, 0x00, 0x11, 0x68, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x3c, 0x00, 0x00, 0x12, 0xa6, + 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x01, 0x58, + 0x00, 0x00, 0x13, 0xe2, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x15, 0x3a, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x00, 0x15, 0x94, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x69, 0x00, 0x63, @@ -11681,223 +12741,288 @@ 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x72, 0x00, 0x75, + 0x00, 0x67, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x76, 0x00, 0x65, 0x00, 0x65, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, 0x00, 0x75, + 0x00, 0x20, 0x00, 0xf8, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x73, 0x00, 0x79, 0x00, 0x6e, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6b, + 0x00, 0x6b, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x75, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x75, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe6, + 0x00, 0x72, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, + 0x00, 0xfc, 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x45, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x20, 0x00, 0x46, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x78, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x74, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x61, 0x00, 0x68, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x76, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x42, 0x00, 0x65, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x75, 0x00, 0x6e, + 0x00, 0x67, 0x00, 0x73, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x44, 0x00, 0x61, 0x00, 0x72, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x2e, 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, + 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb8, 0x03, 0xb5, + 0x03, 0xc9, 0x03, 0xc1, 0x03, 0xb7, 0x03, 0xc4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, + 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xad, + 0x03, 0xc7, 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xc3, 0x03, 0xc7, 0x03, 0xb5, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xc4, + 0x03, 0xb5, 0x03, 0xaf, 0x00, 0x20, 0x03, 0xb3, + 0x03, 0xb9, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc4, + 0x03, 0xb7, 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, + 0x03, 0xae, 0x03, 0xc3, 0x03, 0xb7, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x20, + 0x03, 0xc3, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xb5, 0x03, 0xb9, 0x03, 0xc1, 0x03, 0xac, + 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, + 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, + 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xce, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, 0x00, 0x2e, + 0x00, 0x20, 0x03, 0xa0, 0x03, 0xb9, 0x03, 0xb8, + 0x03, 0xb1, 0x03, 0xbd, 0x03, 0xce, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb5, 0x03, 0xbd, + 0x00, 0x20, 0x03, 0xb8, 0x03, 0xad, 0x03, 0xbb, + 0x03, 0xb5, 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, + 0x03, 0xc1, 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb9, + 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, + 0x03, 0xb9, 0x03, 0xae, 0x03, 0xc3, 0x03, 0xb5, + 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xb1, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xc9, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xc7, 0x03, 0xce, 0x03, 0xc1, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xc0, + 0x03, 0xb5, 0x03, 0xbe, 0x03, 0xb5, 0x03, 0xc1, + 0x03, 0xb3, 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xaf, + 0x03, 0xb1, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xae, + 0x00, 0x20, 0x03, 0xc9, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, + 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xbf, + 0x03, 0xb8, 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xb7, + 0x03, 0xc2, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x75, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, 0x00, 0xfc, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x45, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x7a, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x46, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, 0x00, 0x78, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, 0x00, 0x78, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x6b, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x74, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x45, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x61, 0x00, 0x68, 0x00, 0x72, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x76, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x42, 0x00, 0x65, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x62, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x73, 0x00, 0x72, 0x00, 0x61, 0x00, 0x75, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x44, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x75, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x73, 0x00, 0x70, + 0x00, 0x73, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x59, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x61, + 0x00, 0x62, 0x00, 0x6c, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x27, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x77, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x2e, - 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, - 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb8, 0x03, 0xb5, 0x03, 0xc9, - 0x03, 0xc1, 0x03, 0xb7, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, - 0x03, 0xbb, 0x00, 0x20, 0x03, 0xad, 0x03, 0xc7, - 0x03, 0xb5, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xc3, - 0x03, 0xc7, 0x03, 0xb5, 0x03, 0xb4, 0x03, 0xb9, - 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xb5, - 0x03, 0xaf, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xb9, - 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xb7, - 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, 0x03, 0xae, - 0x03, 0xc3, 0x03, 0xb7, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x03, 0xc5, 0x00, 0x20, 0x03, 0xc3, - 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, - 0x03, 0xb9, 0x03, 0xc1, 0x03, 0xac, 0x03, 0xbc, - 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb1, 0x00, 0x20, - 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc7, - 0x03, 0xc1, 0x03, 0xce, 0x03, 0xbc, 0x03, 0xb1, - 0x03, 0xc4, 0x03, 0xb1, 0x00, 0x2e, 0x00, 0x20, - 0x03, 0xa0, 0x03, 0xb9, 0x03, 0xb8, 0x03, 0xb1, - 0x03, 0xbd, 0x03, 0xce, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb5, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb8, 0x03, 0xad, 0x03, 0xbb, 0x03, 0xb5, - 0x03, 0xc4, 0x03, 0xb5, 0x00, 0x20, 0x03, 0xbd, - 0x03, 0xb1, 0x00, 0x20, 0x03, 0xc7, 0x03, 0xc1, - 0x03, 0xb7, 0x03, 0xc3, 0x03, 0xb9, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xc0, 0x03, 0xbf, 0x03, 0xb9, - 0x03, 0xae, 0x03, 0xc3, 0x03, 0xb5, 0x03, 0xc4, - 0x03, 0xb5, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc5, - 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, - 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, - 0x00, 0x20, 0x03, 0xc9, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc7, 0x03, 0xce, 0x03, 0xc1, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xc0, 0x03, 0xb5, - 0x03, 0xbe, 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb3, - 0x03, 0xb1, 0x03, 0xc3, 0x03, 0xaf, 0x03, 0xb1, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xae, 0x00, 0x20, - 0x03, 0xc9, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, - 0x03, 0xbb, 0x00, 0x20, 0x03, 0xbf, 0x03, 0xb8, - 0x03, 0xcc, 0x03, 0xbd, 0x03, 0xb7, 0x03, 0xc2, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x68, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x68, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x78, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x73, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x59, 0x00, 0x6f, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x61, 0x00, 0x62, - 0x00, 0x6c, 0x00, 0x79, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x27, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x68, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x65, 0x00, 0xf3, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x65, 0x00, 0xf1, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x78, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x61, 0x00, 0x62, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x71, - 0x00, 0x75, 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, - 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x00, 0x00, 0x51, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x74, 0x00, 0x65, 0x00, 0xf3, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0xe8, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x67, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x65, 0x00, 0xf1, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x78, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x4e, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0xe8, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x61, + 0x00, 0x62, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x71, 0x00, 0x75, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x7a, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x69, 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x00, + 0x00, 0x51, 0x00, 0x75, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0x7a, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x75, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x7a, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0xe8, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x4e, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0xe8, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x75, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, + 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x2e, 0x00, 0x00, 0xc7, 0x74, + 0x00, 0x20, 0xc7, 0x74, 0xb8, 0x60, 0xc8, 0x01, + 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, + 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, 0xc0, 0xc9, + 0xc0, 0xc1, 0x00, 0x20, 0xac, 0xbd, 0xd5, 0xd8, + 0xc5, 0xd0, 0x00, 0x20, 0xc7, 0x88, 0xc5, 0xb4, + 0x00, 0x20, 0xd6, 0x5c, 0xc6, 0xa9, 0x00, 0x20, + 0xc6, 0xa9, 0xb3, 0xc4, 0xb8, 0x5c, 0x00, 0x20, + 0xc1, 0x24, 0xac, 0xc4, 0xd5, 0x88, 0xc2, 0xb5, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, + 0xc0, 0xac, 0xc6, 0xa9, 0xc7, 0x90, 0x00, 0x20, + 0xc5, 0xec, 0xb7, 0xec, 0xbd, 0x84, 0xc7, 0x40, + 0x00, 0x20, 0xc0, 0xc9, 0xc0, 0xc1, 0x00, 0x20, + 0xc6, 0x01, 0xc5, 0xed, 0xc7, 0x44, 0x00, 0x20, + 0xd3, 0xb8, 0xc9, 0xd1, 0xd5, 0x5c, 0xb2, 0xe4, + 0xac, 0x70, 0xb0, 0x98, 0x00, 0x20, 0xb5, 0x14, + 0xc2, 0xa4, 0xd5, 0x0c, 0xb8, 0x08, 0xc7, 0x74, + 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, + 0xc7, 0x7c, 0xb8, 0x5c, 0xc1, 0x1c, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x44, 0x00, 0x20, + 0xc1, 0x20, 0xd6, 0x38, 0xd5, 0x58, 0xc9, 0xc0, + 0x00, 0x20, 0xc5, 0x4a, 0xc7, 0x44, 0x00, 0x20, + 0xac, 0x83, 0xc7, 0x85, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, @@ -12209,49 +13334,60 @@ 0x75, 0x28, 0x7a, 0x7a, 0x95, 0x93, 0x62, 0x16, 0x98, 0x6f, 0x79, 0x3a, 0x75, 0x28, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x30, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x64, 0x2f, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x50, 0x41, 0x4c, 0x2d, - 0x52, 0x47, 0x42, 0x2e, 0x69, 0x63, 0x63, 0x00, - 0x70, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x22, 0x70, 0x6c, 0x63, 0x6d, 0x73, + 0x6b, 0x64, 0x7e, 0xaf, 0x74, 0x06, 0x8b, 0xba, + 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, + 0x75, 0x28, 0x4e, 0x8e, 0x82, 0x72, 0x5f, 0x69, + 0x5b, 0x9e, 0x9a, 0x8c, 0x30, 0x02, 0x60, 0xa8, + 0x80, 0xaf, 0x5b, 0x9a, 0x4e, 0x0d, 0x4f, 0x1a, + 0x75, 0x28, 0x5b, 0x83, 0x4f, 0x5c, 0x4e, 0x3a, + 0x7f, 0x16, 0x8f, 0x91, 0x75, 0x28, 0x82, 0x72, + 0x5f, 0x69, 0x7a, 0x7a, 0x95, 0xf4, 0x62, 0x16, + 0x66, 0x3e, 0x79, 0x3a, 0x56, 0x68, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x76, 0x84, + 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x64, 0x2f, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x50, 0x41, 0x4c, 0x2d, 0x52, 0x47, 0x42, 0x2e, + 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xb8, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x25, 0xb8, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x33, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1e, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0xe7, 0x35, 0x47, 0x3e, - 0x70, 0x40, 0x71, 0xe5, 0x4d, 0x37, 0x68, 0xb2, - 0x41, 0x62, 0xd6, 0xef, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0xf3, 0x02, 0xb1, 0xb3, + 0xbb, 0x55, 0x34, 0xb5, 0xd7, 0xc9, 0x7b, 0xfa, + 0xfc, 0x14, 0x9b, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x38, 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x58, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0a, 0x6c, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0a, 0x80, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0c, 0xdc, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0xf0, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xac, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0a, 0xc0, + 0x00, 0x00, 0x0d, 0x1c, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0d, 0x30, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xd4, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe8, + 0x00, 0x00, 0x0d, 0x44, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x58, 0x00, 0x00, 0x00, 0x10, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0a, 0xe8, 0x00, 0x00, 0x00, 0x10, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xe8, + 0x00, 0x00, 0x0d, 0x58, 0x00, 0x00, 0x00, 0x10, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x58, 0x00, 0x00, 0x00, 0x10, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0a, 0xf8, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0b, 0x1c, - 0x00, 0x00, 0x01, 0x8e, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x0c, 0xac, 0x00, 0x00, 0x15, 0xc2, + 0x00, 0x00, 0x0d, 0x68, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0d, 0x8c, + 0x00, 0x00, 0x01, 0x8c, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x0f, 0x18, 0x00, 0x00, 0x16, 0x9e, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x1c, @@ -12260,34 +13396,43 @@ 0x00, 0x43, 0x00, 0x41, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x6a, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x52, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x01, 0xcc, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0x48, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, - 0x00, 0x00, 0x02, 0xf8, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x76, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x9a, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x02, 0x14, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x02, 0x82, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x02, 0xfe, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xae, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x03, 0xe6, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x04, 0x5a, + 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0xd2, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x05, 0xfa, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x06, 0x28, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0x5c, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x05, 0x80, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x05, 0xf4, + 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x06, 0x7a, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x07, 0x02, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x07, 0x7c, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0xee, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x08, 0x7e, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x08, 0xf8, + 0x00, 0x00, 0x08, 0x56, 0x73, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x08, 0xde, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x09, 0x52, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x09, 0xcc, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x0a, 0x3e, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x0a, 0xce, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x0b, 0x48, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -12316,59 +13461,87 @@ 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, - 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, - 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x72, 0x00, 0xe6, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, + 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, + 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, + 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, - 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0xed, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0xf1, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, @@ -12419,70 +13592,107 @@ 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, 0x30, 0x59, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x00, 0xc7, 0x91, 0xad, 0x8c, 0x00, 0x20, + 0xc8, 0x1c, 0xd5, 0x5c, 0xc7, 0x3c, 0xb8, 0x5c, + 0xbd, 0x80, 0xd1, 0x30, 0x00, 0x20, 0xc7, 0x90, + 0xc7, 0x20, 0xb8, 0x6d, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x01, 0x7e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xfd, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, @@ -12549,7 +13759,11 @@ 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, - 0x52, 0x36, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, + 0x52, 0x36, 0x00, 0x00, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x51, 0x4d, + 0x4e, 0x8e, 0x5d, 0xf2, 0x77, 0xe5, 0x76, 0x84, + 0x72, 0x48, 0x67, 0x43, 0x96, 0x50, 0x52, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, 0x00, 0x00, 0x00, 0x00, @@ -12575,77 +13789,78 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x96, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa2, - 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xca, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd2, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe8, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf4, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x08, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x2a, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x46, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x54, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x62, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x68, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x7e, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xc8, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd0, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe6, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf2, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x06, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x28, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x44, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x52, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x60, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x66, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x47, - 0x00, 0x41, 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, - 0x00, 0x5f, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x29, 0x00, 0x30, - 0x00, 0x2e, 0x00, 0x39, 0x00, 0x38, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, - 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x70, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, - 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, - 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, 0x00, 0x41, - 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, 0x00, 0x73, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, - 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x01, 0x5c, 0x00, 0x00, 0x00, 0xc4, - 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0x62, - 0x00, 0x00, 0x02, 0x20, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x90, 0x00, 0x00, 0x03, 0x82, - 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x01, 0xdc, - 0x00, 0x00, 0x05, 0x12, 0x65, 0x6e, 0x47, 0x42, - 0x00, 0x00, 0x01, 0x5e, 0x00, 0x00, 0x06, 0xee, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0x74, - 0x00, 0x00, 0x08, 0x4c, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x64, 0x00, 0x00, 0x09, 0xc0, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x47, 0x00, 0x41, + 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, 0x00, 0x5f, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x29, 0x00, 0x30, 0x00, 0x2e, + 0x00, 0x39, 0x00, 0x38, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, + 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x2d, + 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, 0x00, 0x4c, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, + 0x00, 0x30, 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, + 0x00, 0x41, 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, + 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, + 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x01, 0x5c, + 0x00, 0x00, 0x00, 0xd0, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x62, 0x00, 0x00, 0x02, 0x2c, + 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x01, 0x90, + 0x00, 0x00, 0x03, 0x8e, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xdc, 0x00, 0x00, 0x05, 0x1e, + 0x65, 0x6e, 0x47, 0x42, 0x00, 0x00, 0x01, 0x5e, + 0x00, 0x00, 0x06, 0xfa, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x74, 0x00, 0x00, 0x08, 0x58, + 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x01, 0x64, + 0x00, 0x00, 0x09, 0xcc, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x0b, 0x30, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x62, - 0x00, 0x00, 0x0b, 0x24, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x01, 0x72, 0x00, 0x00, 0x0c, 0x86, + 0x00, 0x00, 0x0c, 0x00, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x01, 0x72, 0x00, 0x00, 0x0d, 0x62, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, - 0x00, 0x00, 0x0d, 0xf8, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x64, 0x00, 0x00, 0x0f, 0x78, + 0x00, 0x00, 0x0e, 0xd4, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x64, 0x00, 0x00, 0x10, 0x54, 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x01, 0x62, - 0x00, 0x00, 0x10, 0xdc, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x5e, 0x00, 0x00, 0x12, 0x3e, + 0x00, 0x00, 0x11, 0xb8, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x5e, 0x00, 0x00, 0x13, 0x1a, 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x01, 0xa6, - 0x00, 0x00, 0x13, 0x9c, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x15, 0x42, + 0x00, 0x00, 0x14, 0x78, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x16, 0x1e, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -12978,6 +14193,32 @@ 0x00, 0x63, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x00, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc5, 0xd0, 0xc1, 0x1c, + 0xb2, 0x94, 0x00, 0x20, 0x00, 0x50, 0x00, 0x41, + 0x00, 0x4c, 0x00, 0x20, 0xac, 0xfc, 0x00, 0x20, + 0x00, 0x53, 0x00, 0x45, 0x00, 0x43, 0x00, 0x41, + 0x00, 0x4d, 0x00, 0x20, 0xbe, 0x44, 0xb5, 0x14, + 0xc6, 0x24, 0x00, 0x20, 0xd4, 0x5c, 0xc9, 0x00, + 0xc5, 0xd0, 0xc1, 0x1c, 0x00, 0x20, 0xd6, 0x5c, + 0xc6, 0xa9, 0xd5, 0x58, 0xb2, 0x94, 0x00, 0x20, + 0xc0, 0xc9, 0xc0, 0xc1, 0x00, 0x20, 0xbc, 0x94, + 0xc7, 0x04, 0xb9, 0x7c, 0x00, 0x20, 0xc8, 0x15, + 0xc7, 0x58, 0xd5, 0x58, 0xba, 0x70, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0xc6, 0x40, 0x00, 0x20, 0xac, 0x70, 0xc7, 0x58, + 0x00, 0x20, 0xc7, 0x20, 0xc0, 0xac, 0xd5, 0x69, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xb3, 0xd9, 0xc6, 0x01, 0xc0, 0xc1, 0xc7, 0x44, + 0x00, 0x20, 0xc7, 0x78, 0xcf, 0x54, 0xb5, 0x29, + 0x00, 0x20, 0xb6, 0x10, 0xb2, 0x94, 0x00, 0x20, + 0xb5, 0x14, 0xcf, 0x54, 0xb5, 0x29, 0xd5, 0x60, + 0x00, 0x20, 0xac, 0xbd, 0xc6, 0xb0, 0xc5, 0xd0, + 0xb9, 0xcc, 0x00, 0x20, 0xd6, 0x5c, 0xc6, 0xa9, + 0xd5, 0x74, 0xc5, 0x7c, 0x00, 0x20, 0xd5, 0x69, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6f, @@ -13328,77 +14569,86 @@ 0x07, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x73, 0x52, 0x47, 0x42, 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, - 0xb4, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x34, 0xb4, 0x6c, 0x63, 0x6d, 0x73, + 0x5c, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x39, 0x5c, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x34, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1f, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0x96, 0xe5, 0x12, 0x94, - 0x25, 0x64, 0x64, 0x0a, 0x5e, 0xa4, 0x7b, 0xca, - 0x1e, 0xfa, 0xa9, 0x1b, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0xb4, 0x4b, 0x23, 0x63, + 0x92, 0xb8, 0xd5, 0x90, 0x19, 0xb8, 0x0c, 0x2e, + 0xaa, 0xbb, 0xb4, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x26, 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x48, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0a, 0x5c, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0a, 0x70, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0c, 0xcc, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0xe0, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0x9c, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0a, 0xb0, + 0x00, 0x00, 0x0d, 0x0c, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0d, 0x20, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xc4, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xd8, + 0x00, 0x00, 0x0d, 0x34, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x48, 0x00, 0x00, 0x00, 0x20, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0a, 0xd8, 0x00, 0x00, 0x00, 0x20, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xd8, + 0x00, 0x00, 0x0d, 0x48, 0x00, 0x00, 0x00, 0x20, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x48, 0x00, 0x00, 0x00, 0x20, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0a, 0xf8, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0b, 0x1c, - 0x00, 0x00, 0x01, 0x48, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x0c, 0x64, 0x00, 0x00, 0x28, 0x50, + 0x00, 0x00, 0x0d, 0x68, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0d, 0x8c, + 0x00, 0x00, 0x01, 0x46, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x0e, 0xd4, 0x00, 0x00, 0x2a, 0x88, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x6a, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x52, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x01, 0xcc, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0x48, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, - 0x00, 0x00, 0x02, 0xf8, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x76, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x9a, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x02, 0x14, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x02, 0x82, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x02, 0xfe, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xae, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x03, 0xe6, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x04, 0x5a, + 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0xd2, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x05, 0xfa, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x06, 0x28, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0x5c, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x05, 0x80, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x05, 0xf4, + 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x06, 0x7a, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x07, 0x02, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x07, 0x7c, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0xee, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x08, 0x7e, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x08, 0xf8, + 0x00, 0x00, 0x08, 0x56, 0x73, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x08, 0xde, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x09, 0x52, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x09, 0xcc, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x0a, 0x3e, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x0a, 0xce, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x0b, 0x48, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -13427,59 +14677,87 @@ 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, - 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, - 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x72, 0x00, 0xe6, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, + 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, + 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, + 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, - 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0xed, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0xf1, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, @@ -13530,70 +14808,107 @@ 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, 0x30, 0x59, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x00, 0xc7, 0x91, 0xad, 0x8c, 0x00, 0x20, + 0xc8, 0x1c, 0xd5, 0x5c, 0xc7, 0x3c, 0xb8, 0x5c, + 0xbd, 0x80, 0xd1, 0x30, 0x00, 0x20, 0xc7, 0x90, + 0xc7, 0x20, 0xb8, 0x6d, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x01, 0x7e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xfd, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, @@ -13660,7 +14975,11 @@ 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, - 0x52, 0x36, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, + 0x52, 0x36, 0x00, 0x00, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x51, 0x4d, + 0x4e, 0x8e, 0x5d, 0xf2, 0x77, 0xe5, 0x76, 0x84, + 0x72, 0x48, 0x67, 0x43, 0x96, 0x50, 0x52, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, 0x00, 0x00, 0x00, 0x00, @@ -13688,68 +15007,71 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x86, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x92, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xa8, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xb4, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xc8, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0xea, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x06, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0x0e, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x1c, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x22, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x38, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xa6, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xb2, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xc6, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0xe8, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x04, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x01, 0x0c, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x1a, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x20, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x36, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, - 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, + 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, + 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, + 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x02, 0x7a, 0x00, 0x00, 0x00, 0xc4, + 0x00, 0x00, 0x02, 0x7a, 0x00, 0x00, 0x00, 0xdc, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0x9e, - 0x00, 0x00, 0x03, 0x3e, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x5c, 0x00, 0x00, 0x05, 0xdc, + 0x00, 0x00, 0x03, 0x56, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x5c, 0x00, 0x00, 0x05, 0xf4, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x03, 0x32, - 0x00, 0x00, 0x08, 0x38, 0x65, 0x6e, 0x47, 0x42, - 0x00, 0x00, 0x02, 0x7e, 0x00, 0x00, 0x0b, 0x6a, + 0x00, 0x00, 0x08, 0x50, 0x65, 0x6e, 0x47, 0x42, + 0x00, 0x00, 0x02, 0x7e, 0x00, 0x00, 0x0b, 0x82, 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0xe6, - 0x00, 0x00, 0x0d, 0xe8, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x02, 0xda, 0x00, 0x00, 0x10, 0xce, - 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x02, 0xa8, - 0x00, 0x00, 0x13, 0xa8, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x03, 0x08, 0x00, 0x00, 0x16, 0x50, - 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7c, - 0x00, 0x00, 0x19, 0x58, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x5a, 0x00, 0x00, 0x1c, 0xd4, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x02, 0x76, - 0x00, 0x00, 0x1f, 0x2e, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x4c, 0x00, 0x00, 0x21, 0xa4, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x03, 0x50, - 0x00, 0x00, 0x23, 0xf0, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x27, 0x40, + 0x00, 0x00, 0x0e, 0x00, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x02, 0xda, 0x00, 0x00, 0x10, 0xe6, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x54, + 0x00, 0x00, 0x13, 0xc0, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x02, 0xa8, 0x00, 0x00, 0x15, 0x14, + 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x03, 0x08, + 0x00, 0x00, 0x17, 0xbc, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x7c, 0x00, 0x00, 0x1a, 0xc4, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x02, 0x5a, + 0x00, 0x00, 0x1e, 0x40, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x76, 0x00, 0x00, 0x20, 0x9a, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x02, 0x4c, + 0x00, 0x00, 0x23, 0x10, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x50, 0x00, 0x00, 0x25, 0x5c, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x01, 0x10, + 0x00, 0x00, 0x28, 0xac, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x29, 0xbc, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6c, @@ -14354,859 +15676,892 @@ 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0xf3, - 0x00, 0x6c, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x67, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x7a, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x01, 0x42, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x61, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x7a, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x72, 0x00, 0x6d, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, - 0x00, 0x77, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x2d, 0x00, 0x50, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x74, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x73, 0x01, 0x42, 0x00, 0x75, - 0x01, 0x7c, 0x00, 0x79, 0x00, 0x20, 0x00, 0x6a, - 0x00, 0x61, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x79, - 0x01, 0x5b, 0x00, 0x6c, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x6f, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x6a, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x2e, 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, + 0xbc, 0x94, 0xc6, 0xa9, 0x00, 0x20, 0xd5, 0x04, + 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, + 0x00, 0x20, 0xd7, 0x34, 0xb8, 0x1b, 0x00, 0x20, + 0xd3, 0x29, 0xce, 0xe4, 0xb4, 0xdc, 0xc6, 0x40, + 0x00, 0x20, 0xb9, 0xc8, 0xc7, 0x74, 0xd0, 0x6c, + 0xb8, 0x5c, 0xc1, 0x8c, 0xd5, 0x04, 0xd2, 0xb8, + 0xc5, 0xd0, 0xc1, 0x1c, 0x00, 0x20, 0xc1, 0x24, + 0xac, 0xc4, 0xd5, 0x88, 0xc7, 0x3c, 0xba, 0x70, + 0x00, 0x20, 0xd0, 0xdc, 0xae, 0x45, 0xd5, 0x58, + 0xc9, 0xc0, 0x00, 0x20, 0xc5, 0x4a, 0xc7, 0x40, + 0x00, 0x20, 0xc7, 0x78, 0xd1, 0x30, 0xb1, 0x37, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0xc0, 0xc9, 0xc0, 0xc1, 0xc6, 0xa9, + 0x00, 0x20, 0xae, 0x30, 0xbc, 0xf8, 0x00, 0x20, + 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, + 0xb8, 0x5c, 0x00, 0x20, 0xc8, 0x74, 0xc7, 0xac, + 0xd5, 0x58, 0xac, 0xe0, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x48, 0x00, 0x44, 0x00, 0x54, 0x00, 0x56, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x57, 0x00, 0x69, - 0x01, 0x19, 0x00, 0x6b, 0x00, 0x73, 0x00, 0x7a, - 0x00, 0x6f, 0x01, 0x5b, 0x01, 0x07, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x62, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x77, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6b, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, 0x00, 0xf3, - 0x00, 0x77, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, - 0x01, 0x7c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x79, 0x01, 0x5b, 0x00, 0x77, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x6c, 0x00, 0x61, - 0x01, 0x07, 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, - 0x01, 0x19, 0x00, 0x6b, 0x00, 0x73, 0x00, 0x7a, - 0x00, 0x6f, 0x01, 0x5b, 0x01, 0x07, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, - 0x01, 0x19, 0x00, 0x70, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x7a, 0x00, 0x6b, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, 0x00, 0x7a, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x61, 0x00, 0x6d, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x7a, 0x01, 0x42, - 0x00, 0x79, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x79, 0x00, 0x62, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x72, - 0x00, 0x75, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x77, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, + 0xc5, 0xd0, 0xc1, 0x1c, 0x00, 0x20, 0xd6, 0x5c, + 0xc6, 0xa9, 0xd5, 0x69, 0xb2, 0xc8, 0xb2, 0xe4, + 0x00, 0x2e, 0x00, 0x20, 0xb3, 0x00, 0xbd, 0x80, + 0xbd, 0x84, 0xc7, 0x58, 0x00, 0x20, 0xbc, 0xf4, + 0xc8, 0x15, 0xd5, 0x58, 0xc9, 0xc0, 0x00, 0x20, + 0xc5, 0x4a, 0xc7, 0x40, 0x00, 0x20, 0xb5, 0x14, + 0xc2, 0xa4, 0xd5, 0x0c, 0xb8, 0x08, 0xc7, 0x74, + 0x00, 0x20, 0xc7, 0xa5, 0xce, 0x58, 0xc5, 0xd0, + 0xc1, 0x1c, 0xb2, 0x94, 0x00, 0x20, 0xc7, 0x74, + 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, + 0xc7, 0x7c, 0xc7, 0x74, 0x00, 0x20, 0xac, 0x04, + 0xd6, 0x39, 0x00, 0x20, 0xc7, 0x78, 0xc1, 0xc4, + 0xc5, 0xd0, 0x00, 0x20, 0xc8, 0x01, 0xd5, 0x69, + 0xd5, 0x58, 0xc9, 0xc0, 0x00, 0x20, 0xc5, 0x4a, + 0xc7, 0x40, 0x00, 0x20, 0xc1, 0x20, 0xd0, 0xdd, + 0xc7, 0x74, 0xac, 0xa0, 0xc9, 0xc0, 0xb9, 0xcc, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0xc6, 0x01, + 0xc5, 0xed, 0xc7, 0x58, 0x00, 0x20, 0xb3, 0x00, + 0xbd, 0x80, 0xbd, 0x84, 0xc7, 0x58, 0x00, 0x20, + 0xc0, 0xc9, 0xc0, 0xc1, 0xc7, 0x44, 0x00, 0x20, + 0xd4, 0x5c, 0xd6, 0x04, 0xd5, 0x60, 0x00, 0x20, + 0xc2, 0x18, 0x00, 0x20, 0xc7, 0x88, 0xc2, 0xb5, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0xf3, 0x00, 0x6c, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x01, 0x42, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, - 0x00, 0x77, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x2d, 0x00, 0x50, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x72, 0x00, 0xe3, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x77, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x7a, 0x00, 0x20, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x6d, 0x00, 0x79, 0x00, 0x20, + 0x00, 0x48, 0x00, 0x65, 0x00, 0x77, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x2d, + 0x00, 0x50, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x4d, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x74, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, + 0x01, 0x42, 0x00, 0x75, 0x01, 0x7c, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x79, 0x01, 0x5b, 0x00, 0x6c, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x77, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x63, 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, - 0x00, 0xe9, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x7a, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x63, 0x00, 0x7a, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0xf3, + 0x00, 0x77, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x74, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xe3, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x20, 0x00, 0x48, 0x00, 0x44, 0x00, 0x54, - 0x00, 0x56, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x73, 0x00, 0xe3, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x70, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x78, 0x00, 0x69, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0xed, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x70, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x67, 0x00, 0x75, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x77, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x6a, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x48, 0x00, 0x44, + 0x00, 0x54, 0x00, 0x56, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x57, 0x00, 0x69, 0x01, 0x19, 0x00, 0x6b, + 0x00, 0x73, 0x00, 0x7a, 0x00, 0x6f, 0x01, 0x5b, + 0x01, 0x07, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x6f, 0x01, 0x7c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, 0x01, 0x5b, + 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x6c, 0x00, 0x61, 0x01, 0x07, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x69, 0x01, 0x19, 0x00, 0x6b, + 0x00, 0x73, 0x00, 0x7a, 0x00, 0x6f, 0x01, 0x5b, + 0x01, 0x07, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0xf3, + 0x00, 0x77, 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x74, 0x01, 0x19, 0x00, 0x70, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x63, 0x00, 0x7a, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x7a, 0x01, 0x42, 0x00, 0x79, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, 0x00, 0x62, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x72, 0x00, 0x75, 0x00, 0x6b, + 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x73, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x2e, 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, - 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x31, 0x04, 0x49, 0x04, 0x35, 0x04, 0x33, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, - 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x4b, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x31, 0x04, 0x3e, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, - 0x04, 0x3c, 0x04, 0x38, 0x00, 0x20, 0x00, 0x48, - 0x00, 0x65, 0x00, 0x77, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x74, 0x00, 0x2d, 0x00, 0x50, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x74, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, - 0x04, 0x3b, 0x00, 0x20, 0x04, 0x42, 0x04, 0x38, - 0x04, 0x3f, 0x04, 0x38, 0x04, 0x47, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x32, - 0x00, 0x20, 0x04, 0x18, 0x04, 0x3d, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x40, 0x04, 0x3d, 0x04, 0x35, - 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, 0x04, 0x32, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x34, 0x04, 0x30, - 0x04, 0x40, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x2d, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x20, 0x04, 0x41, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, 0x04, 0x3e, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3b, 0x04, 0x51, 0x04, 0x3d, - 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x3c, 0x00, 0x20, - 0x04, 0x46, 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x4b, 0x04, 0x3c, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x35, - 0x04, 0x3c, 0x00, 0x20, 0x00, 0x28, 0x00, 0x75, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x61, 0x00, 0x67, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x73, 0x00, 0x29, 0x00, 0x20, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x37, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x32, 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, - 0x04, 0x3b, 0x04, 0x35, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x32, 0x04, 0x4b, - 0x04, 0x41, 0x04, 0x3e, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x47, 0x04, 0x51, - 0x04, 0x42, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x00, 0x48, - 0x00, 0x44, 0x00, 0x54, 0x00, 0x56, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x11, 0x04, 0x3e, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x48, 0x04, 0x38, 0x04, 0x3d, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x3f, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x35, - 0x04, 0x32, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x3d, 0x04, 0x4b, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x36, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x48, 0x04, 0x43, - 0x04, 0x4e, 0x00, 0x20, 0x04, 0x47, 0x04, 0x30, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x46, 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x32, 0x00, 0x2c, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x43, 0x04, 0x3f, 0x04, 0x3d, 0x04, 0x4b, - 0x04, 0x45, 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x45, 0x04, 0x3e, - 0x04, 0x42, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x4d, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x30, 0x04, 0x51, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x45, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x48, 0x04, 0x38, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, 0x04, 0x37, - 0x04, 0x43, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x42, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x4b, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x35, 0x04, 0x47, 0x04, 0x30, - 0x04, 0x42, 0x04, 0x38, 0x00, 0x2e, 0x00, 0x00, - 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x48, 0x04, 0x42, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x40, 0x04, 0x45, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x3c, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x25, 0x04, 0x35, 0x04, 0x32, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x42, 0x00, 0x2d, 0x04, 0x1f, - 0x04, 0x30, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x40, - 0x04, 0x34, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x1c, 0x04, 0x30, 0x04, 0x58, 0x04, 0x3a, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x42, 0x00, 0x20, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x58, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3d, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3d, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x18, - 0x04, 0x3d, 0x04, 0x42, 0x04, 0x35, 0x04, 0x40, - 0x04, 0x3d, 0x04, 0x35, 0x04, 0x42, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x35, 0x04, 0x3e, 0x04, 0x37, - 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x20, - 0x04, 0x13, 0x04, 0x11, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x41, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x37, 0x04, 0x38, 0x04, 0x58, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x3e, 0x04, 0x3a, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x35, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x46, - 0x04, 0x38, 0x04, 0x58, 0x04, 0x35, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x12, 0x04, 0x35, 0x04, 0x5b, - 0x04, 0x38, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x3d, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x35, - 0x04, 0x3a, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, - 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x36, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x32, 0x04, 0x35, - 0x04, 0x5b, 0x04, 0x38, 0x04, 0x3d, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x58, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, 0x04, 0x3f, - 0x04, 0x3d, 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x41, 0x04, 0x20, - 0x04, 0x13, 0x04, 0x11, 0x00, 0x2d, 0x04, 0x43, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x30, - 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, 0x04, 0x58, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x43, - 0x04, 0x3b, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3d, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x34, 0x00, 0x20, 0x04, 0x3b, 0x04, 0x3e, - 0x04, 0x48, 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, - 0x04, 0x31, 0x04, 0x3e, 0x04, 0x40, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, 0x04, 0x48, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x3c, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x5a, 0x04, 0x35, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x76, 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, - 0x00, 0x77, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x2d, 0x00, 0x50, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x4d, 0x00, 0x69, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x48, 0x00, 0x65, 0x00, 0x77, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x2d, + 0x00, 0x50, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x64, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0xe5, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2d, 0x00, 0x66, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x69, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x66, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x67, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, - 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x48, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x64, 0x00, 0x72, + 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x49, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x48, 0x00, 0x44, 0x00, 0x54, 0x00, 0x56, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x44, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe4, 0x00, 0x72, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0xe3, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x73, 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x61, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x7a, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x78, 0x00, 0x69, 0x00, 0x62, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0xed, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x61, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x76, 0x00, 0x20, 0x00, 0x66, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0xe4, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x67, 0x00, 0x75, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x6d, 0x00, 0xe1, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0xe7, + 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x49, + 0x04, 0x35, 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x37, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x4b, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x37, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x31, 0x04, 0x3e, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x4f, 0x04, 0x3c, 0x04, 0x38, + 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, 0x00, 0x77, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x2d, 0x00, 0x50, 0x00, 0x61, 0x00, 0x63, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x00, 0x4d, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x74, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x30, 0x04, 0x3b, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x38, 0x04, 0x3f, 0x04, 0x38, + 0x04, 0x47, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x3c, + 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, 0x04, 0x18, + 0x04, 0x3d, 0x04, 0x42, 0x04, 0x35, 0x04, 0x40, + 0x04, 0x3d, 0x04, 0x35, 0x04, 0x42, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x32, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x34, 0x04, 0x30, 0x04, 0x40, 0x04, 0x42, + 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x2d, 0x04, 0x38, 0x04, 0x37, 0x04, 0x3e, + 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x41, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x35, 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3b, + 0x04, 0x51, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, + 0x04, 0x3c, 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x4b, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3c, 0x00, 0x20, + 0x00, 0x28, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x67, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, + 0x00, 0x29, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x35, 0x04, 0x3b, 0x04, 0x35, + 0x04, 0x32, 0x04, 0x38, 0x04, 0x34, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x4b, 0x04, 0x41, 0x04, 0x3e, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x47, 0x04, 0x51, 0x04, 0x42, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, + 0x00, 0x20, 0x00, 0x48, 0x00, 0x44, 0x00, 0x54, + 0x00, 0x56, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x11, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x48, + 0x04, 0x38, 0x04, 0x3d, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x32, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x35, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3b, + 0x04, 0x38, 0x04, 0x31, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3b, + 0x04, 0x35, 0x04, 0x35, 0x04, 0x32, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3d, 0x04, 0x4b, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x31, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x48, 0x04, 0x43, 0x04, 0x4e, 0x00, 0x20, + 0x04, 0x47, 0x04, 0x30, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3e, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, 0x04, 0x3f, + 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, + 0x04, 0x32, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x45, 0x04, 0x3e, 0x04, 0x42, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x4d, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x38, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x34, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x04, 0x51, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x47, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x45, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x48, + 0x04, 0x38, 0x04, 0x35, 0x00, 0x20, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x37, 0x04, 0x43, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x42, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x4b, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x35, + 0x04, 0x47, 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, + 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x3f, + 0x04, 0x48, 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x40, 0x04, 0x45, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3c, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x25, 0x04, 0x35, + 0x04, 0x32, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x42, + 0x00, 0x2d, 0x04, 0x1f, 0x04, 0x30, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x40, 0x04, 0x34, 0x00, 0x20, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x1c, 0x04, 0x30, + 0x04, 0x58, 0x04, 0x3a, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x41, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x42, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x58, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x41, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x3d, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x18, 0x04, 0x3d, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x40, 0x04, 0x3d, 0x04, 0x35, + 0x04, 0x42, 0x04, 0x43, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, + 0x04, 0x3e, 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, + 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x20, 0x04, 0x13, 0x04, 0x11, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x35, 0x00, 0x20, 0x04, 0x43, + 0x00, 0x20, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3b, + 0x04, 0x35, 0x04, 0x32, 0x04, 0x38, 0x04, 0x37, + 0x04, 0x38, 0x04, 0x58, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3e, + 0x04, 0x3a, 0x04, 0x35, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x46, 0x04, 0x38, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x12, + 0x04, 0x35, 0x04, 0x5b, 0x04, 0x38, 0x04, 0x3d, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x45, + 0x00, 0x20, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x5b, 0x04, 0x38, + 0x04, 0x3d, 0x04, 0x43, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x58, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x43, 0x04, 0x3f, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x20, 0x04, 0x13, 0x04, 0x11, + 0x00, 0x2d, 0x04, 0x43, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x3c, 0x04, 0x30, 0x04, 0x34, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x43, 0x04, 0x3b, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x35, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x34, 0x00, 0x20, + 0x04, 0x3b, 0x04, 0x3e, 0x04, 0x48, 0x00, 0x20, + 0x04, 0x38, 0x04, 0x37, 0x04, 0x31, 0x04, 0x3e, + 0x04, 0x40, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x48, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x5a, + 0x04, 0x35, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x64, 0x00, 0xe5, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x72, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x6b, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x42, 0x00, 0x75, 0x00, 0x20, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0xe7, 0x00, 0x6c, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, 0x00, 0x77, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x2d, 0x00, 0x50, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x4d, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x66, 0x01, 0x31, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x6d, 0x01, 0x31, 0x01, 0x5f, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x73, 0x00, 0x69, 0x00, 0x7a, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0xe5, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2d, + 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x69, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x48, 0x00, 0x44, 0x00, 0x54, - 0x00, 0x56, 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x20, 0x00, 0xfc, 0x00, 0x7a, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x76, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x56, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xe4, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x00, 0xe4, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x69, 0x00, 0x62, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x20, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x64, 0x00, 0xe5, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x74, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x66, + 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x6b, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x42, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0xe7, 0x00, 0x6c, + 0x01, 0x31, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x42, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, + 0x00, 0x77, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x74, 0x00, 0x2d, 0x00, 0x50, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x74, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, + 0x01, 0x31, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6d, 0x01, 0x31, + 0x01, 0x5f, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x48, + 0x00, 0x44, 0x00, 0x54, 0x00, 0x56, 0x00, 0x20, + 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x20, 0x00, 0xfc, + 0x00, 0x7a, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x61, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, - 0x00, 0x6b, 0x01, 0x31, 0x00, 0x20, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0xf6, 0x00, 0x74, 0x00, 0xfc, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0xe7, - 0x00, 0x69, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x73, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x6d, 0x00, 0x69, 0x01, 0x5f, - 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x74, 0x00, 0xfc, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x67, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x42, + 0x00, 0x75, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x6b, 0x01, 0x31, + 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6b, 0x00, 0xf6, + 0x00, 0x74, 0x00, 0xfc, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x65, 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x69, 0x01, 0x5f, 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x74, 0x00, 0xfc, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0xfc, 0x00, 0x6d, 0x00, 0x6b, 0x00, 0xfc, - 0x00, 0x6e, 0x00, 0x64, 0x00, 0xfc, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x00, 0x04, 0x26, 0x04, 0x35, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, - 0x04, 0x33, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x43, 0x04, 0x3b, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x37, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, - 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x56, - 0x04, 0x4f, 0x04, 0x3c, 0x04, 0x38, 0x00, 0x20, - 0x00, 0x48, 0x00, 0x65, 0x00, 0x77, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x2d, - 0x00, 0x50, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x20, - 0x04, 0x56, 0x00, 0x20, 0x00, 0x4d, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x74, 0x00, 0x2c, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x35, 0x04, 0x40, - 0x04, 0x41, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x30, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x45, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x3c, 0x04, 0x3f, 0x20, 0x19, 0x04, 0x4e, - 0x04, 0x42, 0x04, 0x35, 0x04, 0x40, 0x04, 0x56, - 0x04, 0x32, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x26, - 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, - 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x32, 0x00, 0x20, - 0x04, 0x42, 0x04, 0x38, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x38, 0x04, 0x3c, 0x00, 0x20, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x56, 0x04, 0x3d, - 0x04, 0x42, 0x04, 0x35, 0x04, 0x40, 0x04, 0x3d, - 0x04, 0x35, 0x04, 0x42, 0x04, 0x56, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, + 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x74, 0x00, 0xfc, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0xfc, 0x00, 0x6d, + 0x00, 0x6b, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0xfc, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x37, 0x04, 0x30, 0x04, 0x33, 0x04, 0x30, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x37, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x43, 0x04, 0x3b, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x37, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3b, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x56, 0x04, 0x4f, 0x04, 0x3c, + 0x04, 0x38, 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, + 0x00, 0x77, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x74, 0x00, 0x2d, 0x00, 0x50, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x20, 0x04, 0x56, 0x00, 0x20, + 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x74, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x37, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x35, 0x04, 0x40, 0x04, 0x41, 0x04, 0x3e, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, + 0x20, 0x19, 0x04, 0x4e, 0x04, 0x42, 0x04, 0x35, + 0x04, 0x40, 0x04, 0x56, 0x04, 0x32, 0x00, 0x2e, + 0x00, 0x20, 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x32, 0x00, 0x20, 0x04, 0x42, 0x04, 0x38, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x38, + 0x04, 0x3c, 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x56, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x35, + 0x04, 0x40, 0x04, 0x3d, 0x04, 0x35, 0x04, 0x42, + 0x04, 0x56, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x37, 0x04, 0x3e, + 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x56, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x56, 0x04, 0x32, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x04, 0x31, 0x04, 0x35, 0x04, 0x37, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3e, 0x04, 0x34, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x56, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x3a, + 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, - 0x04, 0x32, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x20, 0x04, 0x31, 0x04, 0x35, - 0x04, 0x37, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3e, - 0x04, 0x34, 0x04, 0x30, 0x04, 0x42, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x38, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x56, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x42, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x32, 0x04, 0x56, - 0x04, 0x34, 0x04, 0x35, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x32, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3e, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x57, 0x00, 0x20, - 0x04, 0x4f, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x56, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x11, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x48, 0x04, 0x56, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3b, 0x04, 0x56, - 0x04, 0x31, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, - 0x04, 0x56, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x56, 0x04, 0x32, 0x00, 0x20, 0x04, 0x37, - 0x04, 0x34, 0x04, 0x30, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x56, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x37, 0x04, 0x43, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x41, 0x04, 0x56, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x4f, 0x04, 0x3a, - 0x04, 0x56, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, - 0x04, 0x30, 0x04, 0x4e, 0x04, 0x42, 0x04, 0x4c, - 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2c, - 0x00, 0x20, 0x04, 0x45, 0x04, 0x3e, 0x04, 0x47, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x46, 0x04, 0x35, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x56, 0x00, 0x20, - 0x04, 0x56, 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x56, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, - 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x30, 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x43, 0x04, 0x36, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3e, - 0x04, 0x31, 0x04, 0x40, 0x04, 0x56, 0x00, 0x20, - 0x04, 0x40, 0x04, 0x35, 0x04, 0x37, 0x04, 0x43, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x42, 0x04, 0x30, - 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x56, 0x04, 0x34, 0x00, 0x20, 0x04, 0x47, - 0x04, 0x30, 0x04, 0x41, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x40, 0x04, 0x43, 0x04, 0x3a, 0x04, 0x43, - 0x00, 0x2e, 0x00, 0x00, 0x6b, 0x64, 0x90, 0x1a, - 0x75, 0x28, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, - 0x75, 0x31, 0x00, 0x20, 0x00, 0x48, 0x00, 0x50, - 0x00, 0x20, 0x82, 0x07, 0x00, 0x20, 0x00, 0x4d, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x74, - 0x00, 0x20, 0x51, 0x71, 0x54, 0x0c, 0x8a, 0x2d, - 0x8a, 0x08, 0xff, 0x0c, 0x56, 0xe0, 0x5e, 0x38, - 0x4f, 0x5c, 0x70, 0xba, 0x7d, 0xb2, 0x96, 0x9b, - 0x7d, 0xb2, 0x8d, 0xef, 0x4e, 0x0a, 0x71, 0x21, - 0x6a, 0x19, 0x7c, 0x64, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x82, 0x72, - 0x5f, 0x69, 0x00, 0x20, 0x00, 0x28, 0x5f, 0x71, - 0x50, 0xcf, 0x71, 0x21, 0x63, 0x07, 0x5b, 0x9a, - 0x82, 0x72, 0x5f, 0x69, 0x63, 0xcf, 0x8f, 0xf0, - 0x6a, 0x94, 0x00, 0x29, 0x00, 0x20, 0x76, 0x84, - 0x98, 0x10, 0x8a, 0x2d, 0x63, 0xcf, 0x8f, 0xf0, - 0x6a, 0x94, 0xff, 0x0c, 0x4e, 0xe5, 0x53, 0xca, - 0x00, 0x20, 0x00, 0x48, 0x00, 0x44, 0x00, 0x54, - 0x00, 0x56, 0x00, 0x20, 0x4e, 0x0a, 0x76, 0x84, - 0x4f, 0x7f, 0x75, 0x28, 0x80, 0x0c, 0x75, 0x59, - 0x5b, 0x58, 0x81, 0xf3, 0x4e, 0xca, 0x30, 0x02, - 0x59, 0x27, 0x59, 0x1a, 0x65, 0x78, 0x5c, 0x1a, - 0x67, 0x2a, 0x68, 0x21, 0x6e, 0x96, 0x90, 0x4e, - 0x76, 0x84, 0x98, 0x6f, 0x79, 0x3a, 0x56, 0x68, - 0x76, 0x86, 0x53, 0xef, 0x98, 0x6f, 0x79, 0x3a, + 0x04, 0x32, 0x04, 0x56, 0x04, 0x34, 0x04, 0x35, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x3e, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x57, 0x00, 0x20, 0x04, 0x4f, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x56, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x11, 0x04, 0x56, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x48, 0x04, 0x56, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3b, 0x04, 0x56, 0x04, 0x31, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x56, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, 0x04, 0x32, + 0x00, 0x20, 0x04, 0x37, 0x04, 0x34, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x3d, 0x04, 0x56, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x37, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x41, 0x04, 0x56, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x38, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x4f, 0x04, 0x3a, 0x04, 0x56, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x38, 0x04, 0x37, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x47, 0x04, 0x30, 0x04, 0x4e, + 0x04, 0x42, 0x04, 0x4c, 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x20, 0x4e, 0x2d, 0x53, 0xef, - 0x4f, 0x7f, 0x75, 0x28, 0x76, 0x84, 0x82, 0x72, - 0x5f, 0x69, 0xff, 0x0c, 0x71, 0x36, 0x80, 0x0c, - 0x6b, 0x64, 0x7a, 0x2e, 0x63, 0xcf, 0x8f, 0xf0, - 0x6a, 0x94, 0x90, 0x1a, 0x5e, 0x38, 0x66, 0x2f, - 0x53, 0x70, 0x52, 0x37, 0x66, 0x42, 0x76, 0x84, - 0x67, 0x00, 0x5f, 0x8c, 0x90, 0x78, 0x64, 0xc7, + 0x00, 0x42, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x45, + 0x04, 0x3e, 0x04, 0x47, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x46, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x56, 0x00, 0x20, 0x04, 0x56, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x56, 0x00, 0x20, + 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x43, 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, + 0x04, 0x56, 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, + 0x04, 0x37, 0x04, 0x43, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x42, 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x56, 0x04, 0x34, + 0x00, 0x20, 0x04, 0x47, 0x04, 0x30, 0x04, 0x41, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x40, 0x04, 0x43, + 0x04, 0x3a, 0x04, 0x43, 0x00, 0x2e, 0x00, 0x00, + 0x6b, 0x64, 0x90, 0x1a, 0x75, 0x28, 0x63, 0xcf, + 0x8f, 0xf0, 0x6a, 0x94, 0x75, 0x31, 0x00, 0x20, + 0x00, 0x48, 0x00, 0x50, 0x00, 0x20, 0x82, 0x07, + 0x00, 0x20, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x74, 0x00, 0x20, 0x51, 0x71, + 0x54, 0x0c, 0x8a, 0x2d, 0x8a, 0x08, 0xff, 0x0c, + 0x56, 0xe0, 0x5e, 0x38, 0x4f, 0x5c, 0x70, 0xba, + 0x7d, 0xb2, 0x96, 0x9b, 0x7d, 0xb2, 0x8d, 0xef, + 0x4e, 0x0a, 0x71, 0x21, 0x6a, 0x19, 0x7c, 0x64, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x82, 0x72, 0x5f, 0x69, 0x00, 0x20, + 0x00, 0x28, 0x5f, 0x71, 0x50, 0xcf, 0x71, 0x21, + 0x63, 0x07, 0x5b, 0x9a, 0x82, 0x72, 0x5f, 0x69, + 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x00, 0x29, + 0x00, 0x20, 0x76, 0x84, 0x98, 0x10, 0x8a, 0x2d, + 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0xff, 0x0c, + 0x4e, 0xe5, 0x53, 0xca, 0x00, 0x20, 0x00, 0x48, + 0x00, 0x44, 0x00, 0x54, 0x00, 0x56, 0x00, 0x20, + 0x4e, 0x0a, 0x76, 0x84, 0x4f, 0x7f, 0x75, 0x28, + 0x80, 0x0c, 0x75, 0x59, 0x5b, 0x58, 0x81, 0xf3, + 0x4e, 0xca, 0x30, 0x02, 0x59, 0x27, 0x59, 0x1a, + 0x65, 0x78, 0x5c, 0x1a, 0x67, 0x2a, 0x68, 0x21, + 0x6e, 0x96, 0x90, 0x4e, 0x76, 0x84, 0x98, 0x6f, + 0x79, 0x3a, 0x56, 0x68, 0x76, 0x86, 0x53, 0xef, + 0x98, 0x6f, 0x79, 0x3a, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x4e, 0x2d, 0x53, 0xef, 0x4f, 0x7f, 0x75, 0x28, + 0x76, 0x84, 0x82, 0x72, 0x5f, 0x69, 0xff, 0x0c, + 0x71, 0x36, 0x80, 0x0c, 0x6b, 0x64, 0x7a, 0x2e, + 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x90, 0x1a, + 0x5e, 0x38, 0x66, 0x2f, 0x53, 0x70, 0x52, 0x37, + 0x66, 0x42, 0x76, 0x84, 0x67, 0x00, 0x5f, 0x8c, + 0x90, 0x78, 0x64, 0xc7, 0x30, 0x02, 0x00, 0x00, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x75, 0x31, 0x60, 0xe0, 0x66, 0x6e, + 0x54, 0x8c, 0x5f, 0xae, 0x8f, 0x6f, 0x8b, 0xbe, + 0x8b, 0xa1, 0xff, 0x0c, 0x75, 0x28, 0x4e, 0x8e, + 0x67, 0x2a, 0x68, 0x07, 0x8b, 0xb0, 0x76, 0x84, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x98, 0x9c, 0x82, 0x72, 0x54, 0x8c, + 0x9a, 0xd8, 0x6e, 0x05, 0x75, 0x35, 0x89, 0xc6, + 0x4e, 0x2d, 0xff, 0x0c, 0x5b, 0x83, 0x4e, 0x00, + 0x76, 0xf4, 0x66, 0x2f, 0x4e, 0x92, 0x80, 0x54, + 0x7f, 0x51, 0x4e, 0x0a, 0x76, 0x84, 0x9e, 0xd8, + 0x8b, 0xa4, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x30, 0x02, 0x5c, 0x3d, 0x7b, 0xa1, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x75, 0x28, 0x4e, 0x8e, 0x62, 0x53, + 0x53, 0x70, 0x5f, 0x80, 0x5f, 0x80, 0x66, 0x2f, + 0x4e, 0x2a, 0x7c, 0xdf, 0x7c, 0xd5, 0x76, 0x84, + 0x90, 0x09, 0x62, 0xe9, 0xff, 0x0c, 0x4f, 0x46, + 0x59, 0x1a, 0x65, 0x70, 0x67, 0x2a, 0x68, 0x21, + 0x6b, 0x63, 0x76, 0x84, 0x66, 0x3e, 0x79, 0x3a, + 0x56, 0x68, 0x90, 0xfd, 0x53, 0xef, 0x4e, 0xe5, + 0x66, 0x3e, 0x79, 0x3a, 0x51, 0xfa, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x4e, 0x2d, 0x76, 0x84, 0x59, 0x27, + 0x59, 0x1a, 0x65, 0x70, 0x98, 0x9c, 0x82, 0x72, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x52, 0x47, 0x42, 0x31, 0x39, 0x39, 0x38, 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x6c, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x2f, 0x6c, 0x6c, 0x63, 0x6d, 0x73, + 0x24, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x34, 0x24, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x2f, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1a, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0x2d, 0x12, 0xc2, 0xb9, - 0x57, 0xb9, 0x59, 0x41, 0x54, 0x33, 0xf6, 0x1c, - 0xc5, 0xb7, 0x1c, 0xb5, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0x24, 0xf3, 0xcc, 0x29, + 0x70, 0x46, 0xa4, 0x44, 0x0d, 0x86, 0xf4, 0x9b, + 0xd3, 0x4f, 0x22, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, - 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x05, 0x6e, - 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x06, 0x90, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0f, 0xa4, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0f, 0xb8, + 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x06, 0xbe, + 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x07, 0xe0, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x13, 0x64, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x13, 0x78, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0f, 0xe4, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0f, 0xf8, + 0x00, 0x00, 0x13, 0xa4, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x13, 0xb8, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x10, 0x0c, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x10, 0x20, + 0x00, 0x00, 0x13, 0xcc, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x13, 0xe0, 0x00, 0x00, 0x00, 0x10, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x00, 0x10, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x10, 0x20, + 0x00, 0x00, 0x13, 0xe0, 0x00, 0x00, 0x00, 0x10, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x13, 0xe0, 0x00, 0x00, 0x00, 0x10, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x10, 0x30, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x10, 0x54, - 0x00, 0x00, 0x01, 0x92, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x11, 0xe8, 0x00, 0x00, 0x1d, 0x84, + 0x00, 0x00, 0x13, 0xf0, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x14, 0x14, + 0x00, 0x00, 0x01, 0x90, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x15, 0xa4, 0x00, 0x00, 0x1e, 0x7e, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x42, - 0x00, 0x00, 0x00, 0xf4, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x01, 0x36, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, - 0x00, 0x00, 0x01, 0x76, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x01, 0xb6, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, - 0x00, 0x00, 0x01, 0xf4, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x02, 0x34, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x01, 0x72, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, + 0x00, 0x00, 0x01, 0xb2, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x01, 0xf2, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, + 0x00, 0x00, 0x02, 0x32, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x02, 0x70, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, + 0x00, 0x00, 0x02, 0xb0, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x02, 0xf0, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, - 0x00, 0x00, 0x02, 0x7e, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x02, 0xc4, + 0x00, 0x00, 0x03, 0x3a, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x03, 0x80, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, - 0x00, 0x00, 0x03, 0x06, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x03, 0x2e, + 0x00, 0x00, 0x03, 0xc2, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x03, 0xea, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, + 0x00, 0x00, 0x04, 0x12, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x04, 0x52, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, - 0x00, 0x00, 0x03, 0x6e, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x03, 0xa2, + 0x00, 0x00, 0x04, 0x92, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x04, 0xc6, 0x70, 0x74, 0x50, 0x54, 0x00, 0x00, 0x00, 0x40, - 0x00, 0x00, 0x03, 0xe2, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x04, 0x22, + 0x00, 0x00, 0x05, 0x06, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x05, 0x46, 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, - 0x00, 0x00, 0x04, 0x60, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x04, 0x9a, + 0x00, 0x00, 0x05, 0x84, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x05, 0xbe, 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, - 0x00, 0x00, 0x04, 0xda, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x05, 0x0a, + 0x00, 0x00, 0x05, 0xfe, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x06, 0x2e, 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x2c, - 0x00, 0x00, 0x05, 0x42, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, - 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x00, 0x4b, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x6e, 0x00, 0xed, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, - 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x00, 0x4b, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, - 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x03, 0xa3, - 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb2, 0x03, 0xb1, - 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xbc, - 0x03, 0xb5, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, - 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, - 0x00, 0x29, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x28, - 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, - 0x00, 0x29, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x7a, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, - 0x00, 0x38, 0x00, 0x29, 0x00, 0x2d, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x4b, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, - 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, - 0x00, 0x29, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, - 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x00, 0x41, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, - 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, 0x00, 0x20, - 0x4e, 0x92, 0x63, 0xdb, 0x00, 0x00, 0x00, 0x4b, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, - 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, - 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x00, 0x5a, - 0x00, 0x67, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x20, + 0x00, 0x00, 0x06, 0x66, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x06, 0x92, + 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, + 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, + 0x00, 0x00, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6e, + 0x00, 0xed, 0x00, 0x20, 0x00, 0x73, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, - 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x00, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x62, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, - 0x00, 0x39, 0x00, 0x38, 0x00, 0x30, 0x00, 0x29, - 0x00, 0x00, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, 0x00, 0xed, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, + 0x00, 0x00, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x69, 0x00, 0x74, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, - 0x00, 0x00, 0x04, 0x21, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x3c, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x38, 0x04, 0x3c, 0x04, 0x4b, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x41, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x00, 0x03, 0xa3, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb2, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xcc, + 0x00, 0x20, 0x03, 0xbc, 0x03, 0xb5, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, - 0x04, 0x21, 0x04, 0x30, 0x04, 0x33, 0x04, 0x3b, - 0x04, 0x30, 0x04, 0x41, 0x04, 0x30, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x10, 0x04, 0x34, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x20, 0x04, 0x13, - 0x04, 0x11, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, + 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, + 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, + 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x74, 0x00, 0xed, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, + 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, + 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x7a, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, + 0x00, 0x2d, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, + 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, + 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, @@ -15214,51 +16569,137 @@ 0x00, 0x00, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, - 0x00, 0x31, 0x00, 0x39, 0x00, 0x38, 0x00, 0x38, - 0x00, 0x29, 0x00, 0x20, 0x00, 0x75, 0x00, 0x79, - 0x00, 0x75, 0x00, 0x6d, 0x00, 0x6c, 0x00, 0x75, - 0x00, 0x00, 0x04, 0x21, 0x04, 0x43, 0x04, 0x3c, - 0x04, 0x56, 0x04, 0x41, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x37, 0x00, 0x20, + 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, + 0x00, 0x29, 0x00, 0x20, 0x4e, 0x92, 0x63, 0xdb, + 0x00, 0x00, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, + 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, + 0x00, 0x29, 0x00, 0x20, 0xd6, 0x38, 0xd6, 0x58, + 0x00, 0x00, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, + 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, + 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, + 0x00, 0x00, 0x00, 0x4b, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, - 0x00, 0x00, 0x82, 0x07, 0x00, 0x20, 0x00, 0x41, + 0x00, 0x00, 0x00, 0x5a, 0x00, 0x67, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x7a, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, + 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x38, + 0x00, 0x30, 0x00, 0x29, 0x00, 0x00, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x74, 0x00, 0xed, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, + 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x04, 0x21, + 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3c, 0x04, 0x35, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, 0x04, 0x3c, + 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, 0x04, 0x41, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, + 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, + 0x00, 0x29, 0x00, 0x00, 0x04, 0x21, 0x04, 0x30, + 0x04, 0x33, 0x04, 0x3b, 0x04, 0x30, 0x04, 0x41, + 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x10, 0x04, 0x34, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x20, 0x04, 0x13, 0x04, 0x11, 0x00, 0x20, + 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, + 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x00, 0x4b, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, + 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x00, 0x41, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, + 0x00, 0x38, 0x00, 0x38, 0x00, 0x29, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x79, 0x00, 0x75, 0x00, 0x6d, + 0x00, 0x6c, 0x00, 0x75, 0x00, 0x00, 0x04, 0x21, + 0x04, 0x43, 0x04, 0x3c, 0x04, 0x56, 0x04, 0x41, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x37, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, + 0x00, 0x38, 0x00, 0x29, 0x00, 0x00, 0x82, 0x07, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, + 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, + 0x00, 0x29, 0x00, 0x20, 0x76, 0xf8, 0x5b, 0xb9, + 0x00, 0x00, 0x4e, 0x0e, 0x00, 0x20, 0x00, 0x41, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x65, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x28, 0x00, 0x31, 0x00, 0x39, 0x00, 0x39, 0x00, 0x38, 0x00, 0x29, 0x00, 0x20, - 0x76, 0xf8, 0x5b, 0xb9, 0x00, 0x00, 0x00, 0x00, + 0x51, 0x7c, 0x5b, 0xb9, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x6a, - 0x00, 0x00, 0x00, 0xe8, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x52, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x01, 0xcc, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0x48, - 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, - 0x00, 0x00, 0x02, 0xf8, 0x68, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x03, 0x76, + 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x01, 0x9a, + 0x64, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x02, 0x14, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x02, 0x82, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x02, 0xfe, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xae, + 0x67, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x03, 0xe6, 0x69, 0x74, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x04, 0x5a, + 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0xd2, 0x6e, 0x62, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x05, 0xfa, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x06, 0x28, + 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0x5c, 0x6e, 0x62, 0x4e, 0x4f, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x05, 0x80, 0x70, 0x74, 0x42, 0x52, - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x05, 0xf4, + 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, - 0x00, 0x00, 0x06, 0x7a, 0x73, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x07, 0x02, - 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, - 0x00, 0x00, 0x07, 0x7c, 0x74, 0x72, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x07, 0xee, - 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x08, 0x7e, 0x7a, 0x68, 0x54, 0x57, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x08, 0xf8, + 0x00, 0x00, 0x08, 0x56, 0x73, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x08, 0xde, + 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x09, 0x52, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x09, 0xcc, + 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x0a, 0x3e, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x0a, 0xce, + 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x0b, 0x48, 0x7a, 0x68, 0x43, 0x4e, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, @@ -15287,59 +16728,87 @@ 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, - 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, - 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, - 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, - 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, - 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, - 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, - 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, - 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, - 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, - 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x79, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x73, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x67, 0x00, 0x72, 0x00, 0xe6, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x00, 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x7a, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x65, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, + 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, + 0x03, 0xc5, 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, + 0x03, 0xc1, 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, + 0x03, 0xbb, 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, + 0x03, 0xbd, 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, + 0x03, 0xbb, 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, + 0x03, 0xad, 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, + 0x03, 0xb1, 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, + 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, + 0x03, 0xc3, 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, + 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, + 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, + 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, - 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xbf, - 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, 0x03, 0xbc, - 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, - 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, - 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, - 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, - 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x03, 0xbd, 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, + 0x03, 0xb1, 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xce, 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, + 0x03, 0xc9, 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, + 0x03, 0xc9, 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0xed, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x69, + 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0xf1, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, @@ -15390,70 +16859,107 @@ 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, 0x30, 0x59, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, + 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, + 0xc8, 0x00, 0xc7, 0x91, 0xad, 0x8c, 0x00, 0x20, + 0xc8, 0x1c, 0xd5, 0x5c, 0xc7, 0x3c, 0xb8, 0x5c, + 0xbd, 0x80, 0xd1, 0x30, 0x00, 0x20, 0xc7, 0x90, + 0xc7, 0x20, 0xb8, 0x6d, 0xc2, 0xb5, 0xb2, 0xc8, + 0xb2, 0xe4, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, + 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, - 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, + 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x00, 0x54, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x68, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x01, 0x7e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x64, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, + 0x00, 0xfd, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, @@ -15520,7 +17026,11 @@ 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, - 0x52, 0x36, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, + 0x52, 0x36, 0x00, 0x00, 0x8b, 0xe5, 0x91, 0x4d, + 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x51, 0x4d, + 0x4e, 0x8e, 0x5d, 0xf2, 0x77, 0xe5, 0x76, 0x84, + 0x72, 0x48, 0x67, 0x43, 0x96, 0x50, 0x52, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, 0x00, 0x00, 0x00, 0x00, @@ -15546,78 +17056,79 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x96, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xa2, - 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xca, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd2, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe8, - 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf4, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x08, - 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x2a, - 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x46, - 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x01, 0x58, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x66, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x6c, - 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x82, + 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xc8, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xd0, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xe6, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xf2, + 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x06, + 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x01, 0x28, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x01, 0x44, + 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x01, 0x56, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x01, 0x64, + 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x01, 0x6a, + 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, - 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x47, - 0x00, 0x41, 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, - 0x00, 0x5f, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x29, 0x00, 0x31, - 0x00, 0x2e, 0x00, 0x37, 0x00, 0x39, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, - 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, - 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, - 0x00, 0x44, 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, - 0x00, 0x5f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, - 0x00, 0x72, 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x64, 0x00, 0x00, - 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0c, - 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x01, 0xe2, - 0x00, 0x00, 0x00, 0xc4, 0x63, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xb6, 0x00, 0x00, 0x02, 0xa6, - 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, - 0x00, 0x00, 0x04, 0x5c, 0x65, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x4e, 0x00, 0x00, 0x06, 0x62, - 0x65, 0x6e, 0x47, 0x42, 0x00, 0x00, 0x01, 0xe8, - 0x00, 0x00, 0x08, 0xb0, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x0a, 0x98, - 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe2, - 0x00, 0x00, 0x0c, 0xb8, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x01, 0xee, 0x00, 0x00, 0x0e, 0x9a, + 0x00, 0x6e, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x33, + 0x00, 0x2e, 0x00, 0x32, 0x00, 0x47, 0x00, 0x41, + 0x00, 0x4d, 0x00, 0x55, 0x00, 0x54, 0x00, 0x5f, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x28, 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x29, 0x00, 0x31, 0x00, 0x2e, + 0x00, 0x37, 0x00, 0x39, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x46, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, + 0x00, 0x74, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, + 0x00, 0x63, 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, + 0x00, 0x41, 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x52, 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, + 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x64, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, + 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, + 0x00, 0x00, 0x01, 0xe2, 0x00, 0x00, 0x00, 0xd0, + 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb6, + 0x00, 0x00, 0x02, 0xb2, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x06, 0x00, 0x00, 0x04, 0x68, + 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x02, 0x4e, + 0x00, 0x00, 0x06, 0x6e, 0x65, 0x6e, 0x47, 0x42, + 0x00, 0x00, 0x01, 0xe8, 0x00, 0x00, 0x08, 0xbc, + 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20, + 0x00, 0x00, 0x0a, 0xa4, 0x69, 0x74, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xe2, 0x00, 0x00, 0x0c, 0xc4, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, + 0x00, 0x00, 0x0e, 0xa6, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xee, 0x00, 0x00, 0x0f, 0x94, 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x02, 0x1a, - 0x00, 0x00, 0x10, 0x88, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x3e, 0x00, 0x00, 0x12, 0xa2, + 0x00, 0x00, 0x11, 0x82, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x3e, 0x00, 0x00, 0x13, 0x9c, 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0xd0, - 0x00, 0x00, 0x14, 0xe0, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x1c, 0x00, 0x00, 0x16, 0xb0, + 0x00, 0x00, 0x15, 0xda, 0x73, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x1c, 0x00, 0x00, 0x17, 0xaa, 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x01, 0xd6, - 0x00, 0x00, 0x18, 0xcc, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x3a, 0x00, 0x00, 0x1a, 0xa2, + 0x00, 0x00, 0x19, 0xc6, 0x75, 0x6b, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x3a, 0x00, 0x00, 0x1b, 0x9c, 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0xa8, - 0x00, 0x00, 0x1c, 0xdc, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x00, 0x1d, 0xd6, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x73, @@ -16060,526 +17571,556 @@ 0x00, 0x20, 0x00, 0x72, 0x00, 0x69, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x74, 0x00, 0x69, 0x00, 0x2e, - 0x00, 0x00, 0x00, 0x54, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x7a, - 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x79, 0x00, 0x63, 0x00, 0x6a, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x01, 0x42, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6a, - 0x00, 0x65, 0x00, 0x6b, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, + 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, 0xd3, 0xb8, + 0xc9, 0xd1, 0x00, 0x20, 0xc6, 0x01, 0xc5, 0xed, + 0xc7, 0x40, 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, 0x00, 0x30, 0x00, 0x4d, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6a, 0x00, 0x6d, - 0x00, 0x75, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x69, 0x01, 0x19, 0x00, 0x6b, - 0x00, 0x73, 0x00, 0x7a, 0x00, 0x6f, 0x01, 0x5b, - 0x01, 0x07, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, - 0x01, 0x7c, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x77, - 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, - 0x01, 0x19, 0x00, 0x70, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x77, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x77, - 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x72, 0x00, 0x75, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x59, 0x00, 0x4b, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x4a, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x70, - 0x00, 0x75, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x6a, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x69, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x72, 0x00, 0x75, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, 0x00, 0x2c, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x6f, 0x00, 0x20, 0x01, 0x7c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x01, 0x7c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x77, 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x01, 0x07, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x73, 0x00, 0x7a, - 0x00, 0x79, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6b, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x79, 0x00, 0x20, 0x00, 0x53, 0x00, 0x57, - 0x00, 0x4f, 0x00, 0x50, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x70, - 0x00, 0x61, 0x00, 0xe7, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xe3, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, + 0xac, 0xfc, 0x00, 0x20, 0xc7, 0x20, 0xc0, 0xac, + 0xd5, 0x58, 0xac, 0x8c, 0x00, 0x20, 0xc1, 0x24, + 0xac, 0xc4, 0xd5, 0x88, 0xc7, 0x3c, 0xba, 0x70, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x59, 0x00, 0x4b, 0x00, 0x20, 0xce, 0xec, + 0xb7, 0xec, 0x00, 0x20, 0xd5, 0x04, 0xb9, 0xb0, + 0xd1, 0x30, 0xb8, 0x5c, 0x00, 0x20, 0xc7, 0xac, + 0xd6, 0x04, 0x00, 0x20, 0xac, 0x00, 0xb2, 0xa5, + 0xd5, 0x5c, 0x00, 0x20, 0xba, 0xa8, 0xb4, 0xe0, + 0x00, 0x20, 0xc0, 0xc9, 0xc0, 0xc1, 0xc7, 0x44, + 0x00, 0x20, 0xc5, 0x44, 0xc6, 0xb0, 0xb9, 0x85, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, + 0xc0, 0xac, 0xc9, 0xc4, 0x00, 0x20, 0xd3, 0xb8, + 0xc9, 0xd1, 0x00, 0x2c, 0x00, 0x20, 0xba, 0xa8, + 0xb4, 0xe0, 0x00, 0x20, 0x00, 0x53, 0x00, 0x57, + 0x00, 0x4f, 0x00, 0x50, 0x00, 0x20, 0xc0, 0xc9, + 0xc0, 0xc1, 0xc7, 0x44, 0x00, 0x20, 0xc7, 0xac, + 0xd6, 0x04, 0xd5, 0x60, 0x00, 0x20, 0xc2, 0x18, + 0x00, 0x20, 0xc7, 0x88, 0xb2, 0x94, 0x00, 0x20, + 0xc7, 0x78, 0xc1, 0xc4, 0x00, 0x20, 0xc6, 0xa9, + 0xb3, 0xc4, 0xb8, 0x5c, 0x00, 0x20, 0xb1, 0x10, + 0xb9, 0xac, 0x00, 0x20, 0xc5, 0x4c, 0xb8, 0x24, + 0xc9, 0xc4, 0x00, 0x20, 0xc1, 0x20, 0xd0, 0xdd, + 0xc2, 0x18, 0xb2, 0xe8, 0x00, 0x20, 0xc7, 0x85, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x54, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, + 0x01, 0x44, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x6a, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x61, 0x01, 0x42, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6a, 0x00, 0x65, + 0x00, 0x6b, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x77, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, 0x00, 0x30, 0x00, 0x4d, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x73, - 0x00, 0xed, 0x00, 0x76, 0x00, 0x65, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x73, 0x00, 0x70, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0xed, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x75, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6d, 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x59, 0x00, 0x4b, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x68, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6a, 0x00, 0x6d, 0x00, 0x75, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, + 0x00, 0x69, 0x01, 0x19, 0x00, 0x6b, 0x00, 0x73, + 0x00, 0x7a, 0x00, 0x6f, 0x01, 0x5b, 0x01, 0x07, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x01, 0x7c, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x77, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, 0x01, 0x19, + 0x00, 0x70, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x77, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x77, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x72, 0x00, 0x75, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x59, 0x00, 0x4b, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x4a, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x75, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x6a, 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x73, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6a, 0x00, 0xe1, - 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x53, 0x00, 0x57, 0x00, 0x4f, 0x00, 0x50, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x7a, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, - 0x04, 0x34, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x42, - 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x72, 0x00, 0x75, 0x00, 0x6b, + 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x20, 0x01, 0x7c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x6f, 0x01, 0x7c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x77, + 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x77, 0x00, 0x61, 0x01, 0x07, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x73, 0x00, 0x7a, 0x00, 0x79, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6b, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x53, 0x00, 0x57, 0x00, 0x4f, + 0x00, 0x50, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, + 0x00, 0xe7, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x69, 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, + 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, + 0x00, 0x30, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x62, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x73, 0x00, 0xed, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x69, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0xed, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x59, 0x00, 0x4b, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x75, + 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0xe7, + 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x66, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, 0x00, 0x2c, + 0x00, 0x20, 0x00, 0x6a, 0x00, 0xe1, 0x00, 0x20, + 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x53, + 0x00, 0x57, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x75, 0x00, 0x7a, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x61, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, + 0x04, 0x30, 0x04, 0x3a, 0x04, 0x42, 0x04, 0x38, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x31, 0x04, 0x4b, 0x04, 0x3b, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x31, 0x04, 0x3e, + 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, + 0x00, 0x20, 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, + 0x00, 0x50, 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, + 0x00, 0x32, 0x00, 0x34, 0x00, 0x30, 0x00, 0x4d, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x45, 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x4b, 0x04, 0x32, 0x04, 0x30, 0x04, 0x35, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x48, 0x04, 0x43, + 0x04, 0x4e, 0x00, 0x20, 0x04, 0x47, 0x04, 0x30, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x3e, 0x04, 0x37, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x36, 0x04, 0x3d, 0x04, 0x4b, + 0x04, 0x45, 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3e, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, 0x04, 0x3f, + 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x46, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x3e, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x3d, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x40, 0x04, 0x35, 0x00, 0x20, + 0x00, 0x43, 0x00, 0x4d, 0x00, 0x59, 0x00, 0x4b, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x2d, 0x04, 0x42, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x3f, 0x04, 0x43, 0x04, 0x3b, 0x04, 0x4f, + 0x04, 0x40, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x4b, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x40, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, 0x04, 0x3a, + 0x04, 0x42, 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x44, 0x04, 0x3e, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x44, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x4b, 0x04, 0x3b, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x37, 0x04, 0x40, 0x04, 0x30, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x3a, 0x00, 0x20, 0x00, 0x20, 0x00, 0x53, - 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, 0x00, 0x45, - 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, 0x00, 0x30, - 0x00, 0x4d, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x45, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x42, 0x04, 0x4b, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x48, - 0x04, 0x43, 0x04, 0x4e, 0x00, 0x20, 0x04, 0x47, - 0x04, 0x30, 0x04, 0x41, 0x04, 0x42, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x37, - 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x36, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x46, - 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x32, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, - 0x04, 0x3f, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x46, 0x04, 0x32, 0x04, 0x35, 0x04, 0x42, - 0x04, 0x3d, 0x04, 0x3e, 0x04, 0x3c, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, 0x04, 0x3d, - 0x04, 0x42, 0x04, 0x35, 0x04, 0x40, 0x04, 0x35, - 0x00, 0x20, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x59, - 0x00, 0x4b, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x2d, - 0x04, 0x42, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x43, 0x04, 0x3b, - 0x04, 0x4f, 0x04, 0x40, 0x04, 0x3d, 0x04, 0x4b, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x32, 0x04, 0x4b, - 0x04, 0x31, 0x04, 0x3e, 0x04, 0x40, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x42, 0x04, 0x38, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x44, - 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, + 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x44, 0x04, 0x38, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x32, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x38, 0x00, 0x2c, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x32, 0x04, 0x41, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, - 0x00, 0x53, 0x00, 0x57, 0x00, 0x4f, 0x00, 0x50, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x43, 0x04, 0x42, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x4b, 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x32, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x38, 0x04, 0x37, - 0x04, 0x32, 0x04, 0x35, 0x04, 0x34, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x4b, 0x00, 0x2e, 0x00, 0x00, - 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x38, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, 0x04, 0x43, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x41, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x46, 0x04, 0x32, 0x04, 0x35, + 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, 0x00, 0x53, + 0x00, 0x57, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x20, + 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x43, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x31, 0x04, 0x4b, + 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x4b, 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, 0x00, 0x20, + 0x04, 0x43, 0x04, 0x40, 0x04, 0x35, 0x04, 0x52, + 0x04, 0x38, 0x04, 0x32, 0x04, 0x30, 0x04, 0x5a, + 0x04, 0x30, 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3c, + 0x04, 0x38, 0x04, 0x48, 0x04, 0x59, 0x04, 0x35, + 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x21, 0x04, 0x1c, + 0x04, 0x1f, 0x04, 0x22, 0x04, 0x15, 0x00, 0x2d, + 0x00, 0x32, 0x00, 0x34, 0x00, 0x30, 0x04, 0x1c, + 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x31, 0x04, 0x43, 0x04, 0x45, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x32, 0x04, 0x35, 0x04, 0x5b, 0x04, 0x38, + 0x04, 0x3d, 0x04, 0x43, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x33, 0x04, 0x38, 0x04, 0x5b, + 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x58, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x43, 0x04, 0x3f, 0x04, 0x3d, 0x04, 0x38, + 0x04, 0x45, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x48, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x47, + 0x04, 0x38, 0x04, 0x3c, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x26, 0x04, 0x1c, 0x04, 0x08, 0x04, 0x1a, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x1e, + 0x04, 0x32, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x3f, 0x04, 0x43, 0x04, 0x3b, 0x04, 0x30, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, + 0x04, 0x38, 0x04, 0x37, 0x04, 0x31, 0x04, 0x3e, + 0x04, 0x40, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, 0x04, 0x43, 0x04, 0x40, 0x04, 0x35, 0x04, 0x52, 0x04, 0x38, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x5a, 0x04, 0x30, 0x00, 0x20, 0x04, 0x58, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x3c, 0x04, 0x38, 0x04, 0x48, 0x04, 0x59, - 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x21, - 0x04, 0x1c, 0x04, 0x1f, 0x04, 0x22, 0x04, 0x15, - 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, 0x00, 0x30, - 0x04, 0x1c, 0x00, 0x20, 0x04, 0x38, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x31, 0x04, 0x43, 0x04, 0x45, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x35, 0x04, 0x5b, - 0x04, 0x38, 0x04, 0x3d, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x38, - 0x04, 0x5b, 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, - 0x04, 0x31, 0x04, 0x3e, 0x04, 0x58, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x43, 0x04, 0x3f, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3d, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x48, 0x04, 0x42, - 0x04, 0x30, 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, - 0x04, 0x47, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x26, 0x04, 0x1c, 0x04, 0x08, - 0x04, 0x1a, 0x00, 0x20, 0x04, 0x31, 0x04, 0x3e, - 0x04, 0x58, 0x04, 0x35, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x1e, 0x04, 0x32, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x43, 0x04, 0x3b, - 0x04, 0x30, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x40, 0x00, 0x20, 0x04, 0x37, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x43, 0x04, 0x40, - 0x04, 0x35, 0x04, 0x52, 0x04, 0x38, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x5a, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x44, 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x58, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x48, 0x04, 0x5b, 0x04, 0x35, - 0x04, 0x5a, 0x04, 0x35, 0x00, 0x20, 0x04, 0x43, - 0x00, 0x20, 0x04, 0x48, 0x04, 0x42, 0x04, 0x30, - 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x5a, - 0x04, 0x43, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x58, - 0x04, 0x35, 0x04, 0x40, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x32, 0x04, 0x35, 0x00, 0x20, 0x04, 0x21, - 0x04, 0x12, 0x04, 0x1e, 0x04, 0x1f, 0x00, 0x20, - 0x04, 0x31, 0x04, 0x3e, 0x04, 0x58, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x31, 0x04, 0x38, - 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x38, 0x04, 0x37, - 0x04, 0x32, 0x04, 0x35, 0x04, 0x34, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x35, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x73, 0x00, 0x72, 0x00, 0x79, 0x00, 0x6d, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, - 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, - 0x00, 0x34, 0x00, 0x30, 0x00, 0x4d, 0x00, 0x20, + 0x04, 0x5a, 0x04, 0x35, 0x00, 0x20, 0x04, 0x44, + 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x58, 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x48, 0x04, 0x5b, 0x04, 0x35, 0x04, 0x5a, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x48, 0x04, 0x42, 0x04, 0x30, 0x04, 0x3c, + 0x04, 0x3f, 0x04, 0x30, 0x04, 0x5a, 0x04, 0x43, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, + 0x04, 0x40, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x21, 0x04, 0x12, + 0x04, 0x1e, 0x04, 0x1f, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x3e, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x43, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x38, 0x04, 0x42, + 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x35, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x79, 0x00, 0x6d, 0x00, 0x64, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, + 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, + 0x00, 0x30, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x74, + 0x00, 0xe4, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x6d, 0x00, 0xf6, + 0x00, 0x6a, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, 0x00, 0xe4, + 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x6c, 0x00, 0x67, 0x00, 0xe4, 0x00, 0x6e, + 0x00, 0x67, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x59, 0x00, 0x4b, 0x00, 0x20, + 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x76, 0x00, 0x61, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x61, 0x00, 0x20, + 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x70, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0xe4, 0x00, 0x72, 0x00, 0x74, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x20, 0x00, 0x66, + 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x74, 0x00, 0xe4, 0x00, 0x63, 0x00, 0x6b, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x70, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0xf6, 0x00, 0x6a, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6e, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x6b, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x67, 0x00, 0x20, 0x00, 0x64, 0x00, 0xe5, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x53, 0x00, 0x57, + 0x00, 0x4f, 0x00, 0x50, 0x00, 0x2d, 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x67, 0x00, 0xe4, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x61, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0xe5, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x73, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x42, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x64, 0x00, 0xfc, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x20, + 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, + 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, + 0x00, 0x30, 0x00, 0x4d, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6b, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x01, 0x31, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x20, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x59, 0x00, 0x4b, - 0x00, 0x20, 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, - 0x00, 0x67, 0x00, 0x73, 0x00, 0x6b, 0x00, 0x72, - 0x00, 0x69, 0x00, 0x76, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x20, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x75, - 0x00, 0x6c, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x74, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x69, 0x00, 0x76, 0x00, 0x20, - 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, - 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x72, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x6b, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x20, 0x00, 0x64, - 0x00, 0xe5, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x53, - 0x00, 0x57, 0x00, 0x4f, 0x00, 0x50, 0x00, 0x2d, - 0x00, 0x66, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0xe5, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x42, 0x00, 0x75, - 0x00, 0x20, 0x00, 0x64, 0x00, 0xfc, 0x00, 0x7a, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, - 0x00, 0x20, 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, - 0x00, 0x54, 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, - 0x00, 0x34, 0x00, 0x30, 0x00, 0x4d, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, - 0x01, 0x31, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x59, - 0x00, 0x4b, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x79, 0x00, 0x61, 0x00, 0x7a, - 0x01, 0x31, 0x00, 0x63, 0x01, 0x31, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x73, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6b, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x79, 0x00, 0x61, 0x00, 0x7a, 0x01, 0x31, + 0x00, 0x63, 0x01, 0x31, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x73, 0x01, 0x31, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, 0x00, 0x68, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x61, + 0x00, 0x70, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x42, 0x00, 0x75, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x74, 0x00, 0x6f, 0x01, 0x1f, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x66, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x6b, 0x01, 0x31, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x68, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x69, 0x00, 0x20, 0x00, 0x6b, - 0x00, 0x61, 0x00, 0x70, 0x00, 0x73, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x42, - 0x00, 0x75, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x74, 0x00, 0x6f, 0x01, 0x1f, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x6b, 0x01, 0x31, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, - 0x01, 0x31, 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x61, - 0x00, 0x6b, 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x75, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, - 0x00, 0xe7, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x74, 0x00, 0x69, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x42, 0x00, 0xf6, - 0x00, 0x79, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0xfc, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x53, 0x00, 0x57, - 0x00, 0x4f, 0x00, 0x50, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x79, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x75, 0x01, 0x5f, - 0x00, 0x74, 0x00, 0x75, 0x00, 0x72, 0x00, 0x75, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x72, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x56, 0x04, 0x40, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, - 0x04, 0x30, 0x04, 0x33, 0x04, 0x43, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x43, 0x04, 0x3b, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x32, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x35, - 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x37, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x37, - 0x04, 0x32, 0x04, 0x3e, 0x04, 0x4e, 0x00, 0x20, - 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, - 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, - 0x00, 0x30, 0x00, 0x4d, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x45, 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x56, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x48, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x56, 0x00, 0x20, 0x04, 0x37, + 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x75, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0xe7, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x6b, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x72, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x42, 0x00, 0xf6, 0x00, 0x79, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x74, 0x00, 0xfc, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x53, 0x00, 0x57, 0x00, 0x4f, + 0x00, 0x50, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, 0x00, 0x79, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x75, 0x01, 0x5f, 0x00, 0x74, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x75, 0x00, 0x6c, + 0x00, 0x75, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, + 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x56, 0x04, 0x40, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, + 0x04, 0x33, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x31, 0x04, 0x43, 0x04, 0x3b, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x37, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x37, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x4e, 0x00, 0x20, 0x00, 0x53, + 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, 0x00, 0x45, + 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, 0x00, 0x30, + 0x00, 0x4d, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x45, + 0x04, 0x3e, 0x04, 0x3f, 0x04, 0x3b, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x31, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x48, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x56, 0x00, 0x20, 0x04, 0x37, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, 0x04, 0x32, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x4f, 0x04, 0x3a, + 0x04, 0x56, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, + 0x04, 0x36, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x34, 0x04, 0x40, + 0x04, 0x43, 0x04, 0x3a, 0x04, 0x43, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x3e, + 0x04, 0x3c, 0x04, 0x43, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x3d, 0x04, 0x42, + 0x04, 0x35, 0x04, 0x40, 0x04, 0x56, 0x00, 0x20, + 0x04, 0x37, 0x00, 0x20, 0x04, 0x44, 0x04, 0x30, + 0x04, 0x40, 0x04, 0x31, 0x04, 0x30, 0x04, 0x3c, + 0x04, 0x38, 0x00, 0x20, 0x00, 0x43, 0x00, 0x4d, + 0x00, 0x59, 0x00, 0x4b, 0x00, 0x2e, 0x00, 0x20, + 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x31, 0x04, 0x43, + 0x04, 0x32, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x48, 0x04, 0x38, 0x04, 0x40, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x43, 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, + 0x04, 0x34, 0x04, 0x30, 0x04, 0x33, 0x04, 0x43, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x44, 0x04, 0x3e, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x44, 0x04, 0x56, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x40, 0x04, 0x43, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x40, 0x04, 0x41, 0x04, 0x4c, + 0x04, 0x3a, 0x04, 0x56, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x32, 0x04, 0x56, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3a, 0x04, 0x56, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x41, 0x04, 0x56, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, - 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, - 0x04, 0x32, 0x00, 0x2c, 0x00, 0x20, 0x04, 0x4f, - 0x04, 0x3a, 0x04, 0x56, 0x00, 0x20, 0x04, 0x3c, - 0x04, 0x3e, 0x04, 0x36, 0x04, 0x3d, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x34, - 0x04, 0x40, 0x04, 0x43, 0x04, 0x3a, 0x04, 0x43, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x43, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, 0x04, 0x3d, - 0x04, 0x42, 0x04, 0x35, 0x04, 0x40, 0x04, 0x56, - 0x00, 0x20, 0x04, 0x37, 0x00, 0x20, 0x04, 0x44, - 0x04, 0x30, 0x04, 0x40, 0x04, 0x31, 0x04, 0x30, - 0x04, 0x3c, 0x04, 0x38, 0x00, 0x20, 0x00, 0x43, - 0x00, 0x4d, 0x00, 0x59, 0x00, 0x4b, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x31, - 0x04, 0x43, 0x04, 0x32, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x48, 0x04, 0x38, 0x04, 0x40, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x43, 0x00, 0x20, 0x04, 0x40, - 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, 0x04, 0x33, - 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x44, - 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x33, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x44, 0x04, 0x56, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x42, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x40, 0x04, 0x43, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x40, 0x04, 0x41, - 0x04, 0x4c, 0x04, 0x3a, 0x04, 0x56, 0x04, 0x39, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x30, 0x04, 0x32, 0x04, 0x56, 0x00, 0x2c, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3a, - 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, - 0x04, 0x38, 0x00, 0x20, 0x04, 0x32, 0x04, 0x41, - 0x04, 0x56, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x00, 0x20, 0x00, 0x53, 0x00, 0x57, - 0x00, 0x4f, 0x00, 0x50, 0x00, 0x20, 0x04, 0x3c, - 0x04, 0x3e, 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x31, 0x04, 0x43, 0x04, 0x42, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x34, - 0x04, 0x40, 0x04, 0x43, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x2e, 0x00, 0x00, 0x6b, 0x64, 0x7d, 0xe8, - 0x8f, 0x2f, 0x75, 0x28, 0x7a, 0x7a, 0x95, 0x93, - 0x8a, 0x2d, 0x8a, 0x08, 0x70, 0xba, 0x00, 0x20, - 0x00, 0x53, 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, - 0x00, 0x45, 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, - 0x00, 0x30, 0x00, 0x4d, 0x00, 0x20, 0xff, 0x0c, - 0x4e, 0x26, 0x53, 0x05, 0x54, 0x2b, 0x00, 0x20, - 0x00, 0x43, 0x00, 0x4d, 0x00, 0x59, 0x00, 0x4b, - 0x00, 0x20, 0x82, 0x72, 0x5f, 0x69, 0x53, 0x70, - 0x88, 0x68, 0x6a, 0x5f, 0x53, 0xef, 0x75, 0x28, - 0x76, 0x84, 0x7d, 0x55, 0x59, 0x27, 0x59, 0x1a, - 0x65, 0x78, 0x82, 0x72, 0x5f, 0x69, 0x30, 0x02, - 0x90, 0x19, 0x66, 0x2f, 0x76, 0xf8, 0x72, 0x47, - 0x7d, 0xe8, 0x8f, 0x2f, 0x80, 0x05, 0x82, 0x07, - 0x52, 0x17, 0x53, 0x70, 0x4f, 0x7f, 0x75, 0x28, - 0x80, 0x05, 0x76, 0x84, 0x50, 0x4f, 0x59, 0x7d, - 0x90, 0x78, 0x64, 0xc7, 0xff, 0x0c, 0x56, 0xe0, - 0x70, 0xba, 0x80, 0xfd, 0x51, 0x8d, 0x73, 0xfe, - 0x51, 0xfa, 0x62, 0x40, 0x67, 0x09, 0x76, 0x84, + 0x04, 0x4c, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, 0x00, 0x53, 0x00, 0x57, 0x00, 0x4f, - 0x00, 0x50, 0x00, 0x20, 0x82, 0x72, 0x5f, 0x69, - 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, + 0x00, 0x50, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, + 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x43, 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x34, 0x04, 0x40, + 0x04, 0x43, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x2e, + 0x00, 0x00, 0x6b, 0x64, 0x7d, 0xe8, 0x8f, 0x2f, + 0x75, 0x28, 0x7a, 0x7a, 0x95, 0x93, 0x8a, 0x2d, + 0x8a, 0x08, 0x70, 0xba, 0x00, 0x20, 0x00, 0x53, + 0x00, 0x4d, 0x00, 0x50, 0x00, 0x54, 0x00, 0x45, + 0x00, 0x2d, 0x00, 0x32, 0x00, 0x34, 0x00, 0x30, + 0x00, 0x4d, 0x00, 0x20, 0xff, 0x0c, 0x4e, 0x26, + 0x53, 0x05, 0x54, 0x2b, 0x00, 0x20, 0x00, 0x43, + 0x00, 0x4d, 0x00, 0x59, 0x00, 0x4b, 0x00, 0x20, + 0x82, 0x72, 0x5f, 0x69, 0x53, 0x70, 0x88, 0x68, + 0x6a, 0x5f, 0x53, 0xef, 0x75, 0x28, 0x76, 0x84, + 0x7d, 0x55, 0x59, 0x27, 0x59, 0x1a, 0x65, 0x78, + 0x82, 0x72, 0x5f, 0x69, 0x30, 0x02, 0x90, 0x19, + 0x66, 0x2f, 0x76, 0xf8, 0x72, 0x47, 0x7d, 0xe8, + 0x8f, 0x2f, 0x80, 0x05, 0x82, 0x07, 0x52, 0x17, + 0x53, 0x70, 0x4f, 0x7f, 0x75, 0x28, 0x80, 0x05, + 0x76, 0x84, 0x50, 0x4f, 0x59, 0x7d, 0x90, 0x78, + 0x64, 0xc7, 0xff, 0x0c, 0x56, 0xe0, 0x70, 0xba, + 0x80, 0xfd, 0x51, 0x8d, 0x73, 0xfe, 0x51, 0xfa, + 0x62, 0x40, 0x67, 0x09, 0x76, 0x84, 0x00, 0x20, + 0x00, 0x53, 0x00, 0x57, 0x00, 0x4f, 0x00, 0x50, + 0x00, 0x20, 0x82, 0x72, 0x5f, 0x69, 0x30, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x66, 0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2f, 0x0e, 0x00, 0x00, 0x00, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x47, 0x42, 0x2e, 0x69, 0x63, 0x63, 0x00, 0x00, 0x00, - 0x34, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x2c, 0x34, 0x6c, 0x63, 0x6d, 0x73, + 0x08, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x31, 0x08, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20, - 0x07, 0xdf, 0x00, 0x05, 0x00, 0x1b, 0x00, 0x09, - 0x00, 0x23, 0x00, 0x31, 0x61, 0x63, 0x73, 0x70, + 0x07, 0xe0, 0x00, 0x01, 0x00, 0x05, 0x00, 0x0f, + 0x00, 0x17, 0x00, 0x1c, 0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, - 0x6c, 0x63, 0x6d, 0x73, 0xe9, 0x02, 0xf6, 0xe9, - 0xda, 0x41, 0x1b, 0x07, 0x4d, 0xe2, 0x2e, 0xae, - 0x63, 0x75, 0x39, 0x43, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x63, 0x6d, 0x73, 0x78, 0xf6, 0x10, 0xfa, + 0xbb, 0x5b, 0x08, 0x0a, 0x10, 0x26, 0x86, 0xff, + 0x9d, 0xe7, 0xee, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x3a, 0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x5c, - 0x00, 0x00, 0x09, 0x14, 0x77, 0x74, 0x70, 0x74, - 0x00, 0x00, 0x0a, 0x70, 0x00, 0x00, 0x00, 0x14, - 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0a, 0x84, + 0x00, 0x00, 0x0b, 0x82, 0x77, 0x74, 0x70, 0x74, + 0x00, 0x00, 0x0c, 0xe0, 0x00, 0x00, 0x00, 0x14, + 0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x0c, 0xf4, 0x00, 0x00, 0x00, 0x2c, 0x72, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xb0, 0x00, 0x00, 0x00, 0x14, - 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0a, 0xc4, + 0x00, 0x00, 0x0d, 0x20, 0x00, 0x00, 0x00, 0x14, + 0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x0d, 0x34, 0x00, 0x00, 0x00, 0x14, 0x67, 0x58, 0x59, 0x5a, - 0x00, 0x00, 0x0a, 0xd8, 0x00, 0x00, 0x00, 0x14, - 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xec, + 0x00, 0x00, 0x0d, 0x48, 0x00, 0x00, 0x00, 0x14, + 0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x5c, 0x00, 0x00, 0x00, 0x10, 0x67, 0x54, 0x52, 0x43, - 0x00, 0x00, 0x0a, 0xec, 0x00, 0x00, 0x00, 0x10, - 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0a, 0xec, + 0x00, 0x00, 0x0d, 0x5c, 0x00, 0x00, 0x00, 0x10, + 0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x0d, 0x5c, 0x00, 0x00, 0x00, 0x10, 0x63, 0x68, 0x72, 0x6d, - 0x00, 0x00, 0x0a, 0xfc, 0x00, 0x00, 0x00, 0x24, - 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0b, 0x20, - 0x00, 0x00, 0x01, 0x9c, 0x64, 0x6d, 0x64, 0x64, - 0x00, 0x00, 0x0c, 0xbc, 0x00, 0x00, 0x1f, 0x76, + 0x00, 0x00, 0x0d, 0x6c, 0x00, 0x00, 0x00, 0x24, + 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00, 0x0d, 0x90, + 0x00, 0x00, 0x01, 0x9a, 0x64, 0x6d, 0x64, 0x64, + 0x00, 0x00, 0x0f, 0x2c, 0x00, 0x00, 0x21, 0xda, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x1e, @@ -16588,35 +18129,44 @@ 0x00, 0x61, 0x00, 0x74, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0xe8, + 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x01, 0x30, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x01, 0x52, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x01, 0xcc, - 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, - 0x00, 0x00, 0x02, 0x48, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x02, 0xf8, + 0x00, 0x00, 0x01, 0x9a, 0x64, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x02, 0x14, + 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, + 0x00, 0x00, 0x02, 0x82, 0x65, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x02, 0xfe, + 0x65, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, + 0x00, 0x00, 0x03, 0xae, 0x67, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x04, 0x2c, 0x68, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, - 0x00, 0x00, 0x03, 0x76, 0x69, 0x64, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x03, 0xe6, + 0x00, 0x00, 0x04, 0x9e, 0x69, 0x64, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x05, 0x0e, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, - 0x00, 0x00, 0x04, 0x5a, 0x6a, 0x61, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x04, 0xd2, - 0x6e, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, - 0x00, 0x00, 0x05, 0x00, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x05, 0x80, + 0x00, 0x00, 0x05, 0x82, 0x6a, 0x61, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x05, 0xfa, + 0x6b, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, + 0x00, 0x00, 0x06, 0x28, 0x6e, 0x62, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x06, 0x5c, + 0x6e, 0x62, 0x4e, 0x4f, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x06, 0xdc, 0x70, 0x6c, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x07, 0x5c, 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x00, 0x86, - 0x00, 0x00, 0x05, 0xf4, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x06, 0x7a, - 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, - 0x00, 0x00, 0x07, 0x02, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x07, 0x7c, - 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, - 0x00, 0x00, 0x07, 0xee, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x08, 0x7e, - 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0x1c, - 0x00, 0x00, 0x08, 0xf8, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x00, 0x07, 0xd0, 0x72, 0x75, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x08, 0x56, + 0x73, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, + 0x00, 0x00, 0x08, 0xde, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x09, 0x52, + 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, + 0x00, 0x00, 0x09, 0xcc, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x0a, 0x3e, + 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, + 0x00, 0x00, 0x0a, 0xce, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0b, 0x48, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0x1e, + 0x00, 0x00, 0x0b, 0x64, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, @@ -16645,58 +18195,86 @@ 0x00, 0x63, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0xe1, 0x00, 0x76, 0x00, 0x79, 0x00, 0x00, - 0x00, 0x44, 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, 0x00, 0x7a, - 0x00, 0x74, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x72, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x6b, - 0x00, 0x75, 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, - 0x03, 0xc4, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, - 0x03, 0xbf, 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, - 0x00, 0x20, 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, - 0x03, 0xb1, 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xb1, 0x03, 0xbb, 0x03, 0xbb, - 0x03, 0xb1, 0x03, 0xb3, 0x03, 0xbc, 0x03, 0xad, - 0x03, 0xbd, 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, - 0x03, 0xc0, 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, - 0x03, 0xbf, 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, - 0x03, 0xb3, 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xc3, - 0x03, 0xc4, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, - 0x00, 0x20, 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, - 0x03, 0xb9, 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb9, - 0x03, 0xc3, 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, - 0x03, 0xc2, 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbd, - 0x03, 0xb5, 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb1, - 0x03, 0xc4, 0x03, 0xb9, 0x03, 0xba, 0x03, 0xce, - 0x03, 0xbd, 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb9, - 0x03, 0xba, 0x03, 0xb1, 0x03, 0xb9, 0x03, 0xc9, - 0x03, 0xbc, 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, - 0x03, 0xbd, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x6b, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, + 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x62, 0x00, 0x65, 0x00, 0x67, + 0x00, 0x72, 0x00, 0xe6, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, 0x00, 0x44, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x73, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x7a, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6b, 0x00, 0x65, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, + 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x68, 0x00, 0x74, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x72, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x6b, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x00, 0x03, 0x91, 0x03, 0xc5, 0x03, 0xc4, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xc1, 0x03, 0xbf, + 0x03, 0xc6, 0x03, 0xaf, 0x03, 0xbb, 0x00, 0x20, + 0x03, 0xb5, 0x03, 0xaf, 0x03, 0xbd, 0x03, 0xb1, + 0x03, 0xb9, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xb1, 0x03, 0xbb, 0x03, 0xbb, 0x03, 0xb1, + 0x03, 0xb3, 0x03, 0xbc, 0x03, 0xad, 0x03, 0xbd, + 0x03, 0xbf, 0x00, 0x20, 0x03, 0xb1, 0x03, 0xc0, + 0x03, 0xcc, 0x00, 0x20, 0x03, 0xc4, 0x03, 0xbf, + 0x03, 0xc5, 0x03, 0xc2, 0x00, 0x20, 0x03, 0xb3, + 0x03, 0xbd, 0x03, 0xc9, 0x03, 0xc3, 0x03, 0xc4, + 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, 0x00, 0x20, + 0x03, 0xc0, 0x03, 0xb5, 0x03, 0xc1, 0x03, 0xb9, + 0x03, 0xbf, 0x03, 0xc1, 0x03, 0xb9, 0x03, 0xc3, + 0x03, 0xbc, 0x03, 0xbf, 0x03, 0xcd, 0x03, 0xc2, + 0x00, 0x20, 0x03, 0xc0, 0x03, 0xbd, 0x03, 0xb5, + 0x03, 0xc5, 0x03, 0xbc, 0x03, 0xb1, 0x03, 0xc4, + 0x03, 0xb9, 0x03, 0xba, 0x03, 0xce, 0x03, 0xbd, + 0x00, 0x20, 0x03, 0xb4, 0x03, 0xb9, 0x03, 0xba, + 0x03, 0xb1, 0x03, 0xb9, 0x03, 0xc9, 0x03, 0xbc, + 0x03, 0xac, 0x03, 0xc4, 0x03, 0xc9, 0x03, 0xbd, + 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0xe1, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x63, 0x00, 0x63, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, + 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x69, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, + 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x66, 0x00, 0xed, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x69, 0x00, 0xf3, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0xf1, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, 0x00, 0x00, 0x00, 0x45, 0x00, 0x7a, 0x00, 0x20, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, @@ -16747,71 +18325,108 @@ 0x65, 0xe2, 0x77, 0xe5, 0x30, 0x6e, 0x84, 0x57, 0x4f, 0x5c, 0x6a, 0x29, 0x30, 0x4b, 0x30, 0x89, 0x30, 0xd5, 0x30, 0xea, 0x30, 0xfc, 0x30, 0x67, - 0x30, 0x59, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x72, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x6b, 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x68, 0x00, 0x61, - 0x00, 0x76, 0x00, 0x73, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x74, 0x00, 0x73, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x6b, 0x00, 0x73, - 0x00, 0x6a, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x30, 0x59, 0x00, 0x00, 0xc7, 0x74, 0x00, 0x20, + 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, + 0xc7, 0x40, 0x00, 0x20, 0xc8, 0x00, 0xc7, 0x91, + 0xad, 0x8c, 0x00, 0x20, 0xc8, 0x1c, 0xd5, 0x5c, + 0xc7, 0x3c, 0xb8, 0x5c, 0xbd, 0x80, 0xd1, 0x30, + 0x00, 0x20, 0xc7, 0x90, 0xc7, 0x20, 0xb8, 0x6d, + 0xc2, 0xb5, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x67, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x61, 0x00, 0x77, - 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x6b, - 0x00, 0x69, 0x00, 0x63, 0x00, 0x68, 0x00, 0x00, - 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x76, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x72, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xf5, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x66, 0x00, 0x72, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x6b, 0x00, 0x6a, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x68, 0x00, 0x61, 0x00, 0x76, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x73, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x6b, 0x00, 0x73, 0x00, 0x6a, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x72, 0x00, 0x00, + 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, + 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x7a, 0x00, 0x65, + 0x01, 0x44, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x77, 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x68, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x04, 0x2d, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x31, - 0x04, 0x3e, 0x04, 0x34, 0x04, 0x35, 0x04, 0x3d, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x38, - 0x04, 0x45, 0x00, 0x2d, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x38, - 0x04, 0x37, 0x04, 0x32, 0x04, 0x35, 0x04, 0x41, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0x69, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0xe9, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x76, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, + 0x00, 0xe7, 0x00, 0xf5, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x75, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x69, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x69, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x73, + 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x32, + 0x04, 0x3e, 0x04, 0x31, 0x04, 0x3e, 0x04, 0x34, + 0x04, 0x35, 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3a, 0x04, 0x38, 0x04, 0x45, 0x00, 0x2d, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x31, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x32, + 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x42, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x42, 0x04, 0x3d, - 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x33, 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x47, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x00, 0x04, 0x1e, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x33, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x47, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x65, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x68, 0x00, 0x75, 0x00, 0x6a, 0x00, 0x65, + 0x00, 0x20, 0x01, 0x7e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x6d, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0xfd, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0xe1, 0x00, 0x76, 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x58, @@ -16878,6 +18493,10 @@ 0x8f, 0xf0, 0x6a, 0x94, 0x67, 0x2a, 0x53, 0xd7, 0x5d, 0xf2, 0x77, 0xe5, 0x84, 0x57, 0x4f, 0x5c, 0x6b, 0x0a, 0x96, 0x50, 0x52, 0x36, 0x00, 0x00, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x51, 0x4d, 0x4e, 0x8e, 0x5d, 0xf2, + 0x77, 0xe5, 0x76, 0x84, 0x72, 0x48, 0x67, 0x43, + 0x96, 0x50, 0x52, 0x36, 0x00, 0x00, 0x00, 0x00, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32, @@ -16903,78 +18522,81 @@ 0x64, 0x69, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x28, - 0x00, 0x00, 0x00, 0xca, 0x00, 0x00, 0x00, 0x08, - 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x00, 0xe8, 0x00, 0x00, 0x00, 0x0c, - 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00, 0x22, - 0x00, 0x00, 0x01, 0x2a, 0x00, 0x00, 0x00, 0x1c, - 0x00, 0x00, 0x01, 0x46, 0x00, 0x00, 0x00, 0x1c, - 0x00, 0x00, 0x01, 0x62, 0x00, 0x00, 0x00, 0x0e, - 0x00, 0x00, 0x01, 0x70, 0x00, 0x00, 0x00, 0x06, - 0x00, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x16, - 0x00, 0x00, 0x01, 0x8c, 0x00, 0x00, 0x00, 0x10, + 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0a, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x28, + 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x08, + 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x16, + 0x00, 0x00, 0x00, 0xe6, 0x00, 0x00, 0x00, 0x0c, + 0x00, 0x00, 0x00, 0xf2, 0x00, 0x00, 0x00, 0x14, + 0x00, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x22, + 0x00, 0x00, 0x01, 0x28, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x01, 0x44, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x01, 0x60, 0x00, 0x00, 0x00, 0x0e, + 0x00, 0x00, 0x01, 0x6e, 0x00, 0x00, 0x00, 0x06, + 0x00, 0x00, 0x01, 0x74, 0x00, 0x00, 0x00, 0x16, + 0x00, 0x00, 0x01, 0x8a, 0x00, 0x00, 0x00, 0x10, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, - 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x31, - 0x00, 0x2e, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, - 0x00, 0x31, 0x00, 0x47, 0x00, 0x41, 0x00, 0x4d, - 0x00, 0x55, 0x00, 0x54, 0x00, 0x5f, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00, 0x28, - 0x00, 0x73, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, - 0x00, 0x29, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x37, - 0x00, 0x39, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, - 0x00, 0x5f, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x64, 0x00, 0x75, 0x00, 0x63, 0x00, 0x74, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x64, 0x00, 0x43, 0x00, 0x4d, - 0x00, 0x46, 0x00, 0x5f, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, - 0x00, 0x63, 0x00, 0x64, 0x00, 0x2d, 0x00, 0x63, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, - 0x00, 0x65, 0x00, 0x2d, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x53, 0x00, 0x54, 0x00, 0x41, - 0x00, 0x4e, 0x00, 0x44, 0x00, 0x41, 0x00, 0x52, - 0x00, 0x44, 0x00, 0x5f, 0x00, 0x73, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x65, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x74, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, - 0x00, 0x62, 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x43, 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, - 0x00, 0x41, 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x64, 0x6d, 0x6c, 0x75, 0x63, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, + 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x31, + 0x00, 0x2e, 0x00, 0x33, 0x00, 0x2e, 0x00, 0x32, + 0x00, 0x47, 0x00, 0x41, 0x00, 0x4d, 0x00, 0x55, + 0x00, 0x54, 0x00, 0x5f, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x28, 0x00, 0x73, + 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, 0x00, 0x29, + 0x00, 0x30, 0x00, 0x2e, 0x00, 0x37, 0x00, 0x39, + 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, 0x00, 0x5f, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x64, + 0x00, 0x75, 0x00, 0x63, 0x00, 0x74, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x43, 0x00, 0x4d, 0x00, 0x46, + 0x00, 0x5f, 0x00, 0x62, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x64, 0x00, 0x2d, 0x00, 0x63, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x2d, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x53, 0x00, 0x54, 0x00, 0x41, 0x00, 0x4e, + 0x00, 0x44, 0x00, 0x41, 0x00, 0x52, 0x00, 0x44, + 0x00, 0x5f, 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x63, 0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x63, 0x00, 0x68, + 0x00, 0x2d, 0x00, 0x72, 0x00, 0x67, 0x00, 0x62, + 0x00, 0x4c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x73, 0x00, 0x65, 0x00, 0x43, + 0x00, 0x43, 0x00, 0x30, 0x00, 0x44, 0x00, 0x41, + 0x00, 0x54, 0x00, 0x41, 0x00, 0x5f, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x75, 0x00, 0x72, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x64, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, - 0x00, 0x00, 0x02, 0x24, 0x00, 0x00, 0x00, 0xb8, + 0x00, 0x00, 0x02, 0x24, 0x00, 0x00, 0x00, 0xd0, 0x63, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0x26, - 0x00, 0x00, 0x02, 0xdc, 0x64, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x78, 0x00, 0x00, 0x05, 0x02, + 0x00, 0x00, 0x02, 0xf4, 0x64, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x78, 0x00, 0x00, 0x05, 0x1a, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x02, 0x90, - 0x00, 0x00, 0x07, 0x7a, 0x65, 0x73, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x3e, 0x00, 0x00, 0x0a, 0x0a, + 0x00, 0x00, 0x07, 0x92, 0x65, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x3e, 0x00, 0x00, 0x0a, 0x22, 0x69, 0x74, 0x00, 0x00, 0x00, 0x00, 0x02, 0x62, - 0x00, 0x00, 0x0c, 0x48, 0x70, 0x6c, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x50, 0x00, 0x00, 0x0e, 0xaa, - 0x70, 0x74, 0x42, 0x52, 0x00, 0x00, 0x02, 0x32, - 0x00, 0x00, 0x10, 0xfa, 0x72, 0x75, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x92, 0x00, 0x00, 0x13, 0x2c, - 0x73, 0x72, 0x00, 0x00, 0x00, 0x00, 0x02, 0x2a, - 0x00, 0x00, 0x15, 0xbe, 0x73, 0x76, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x2c, 0x00, 0x00, 0x17, 0xe8, - 0x74, 0x72, 0x00, 0x00, 0x00, 0x00, 0x02, 0x26, - 0x00, 0x00, 0x1a, 0x14, 0x75, 0x6b, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x54, 0x00, 0x00, 0x1c, 0x3a, - 0x7a, 0x68, 0x54, 0x57, 0x00, 0x00, 0x00, 0xe8, - 0x00, 0x00, 0x1e, 0x8e, 0x00, 0x54, 0x00, 0x68, + 0x00, 0x00, 0x0c, 0x60, 0x6b, 0x6f, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x5c, 0x00, 0x00, 0x0e, 0xc2, + 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x02, 0x50, + 0x00, 0x00, 0x10, 0x1e, 0x70, 0x74, 0x42, 0x52, + 0x00, 0x00, 0x02, 0x32, 0x00, 0x00, 0x12, 0x6e, + 0x72, 0x75, 0x00, 0x00, 0x00, 0x00, 0x02, 0x92, + 0x00, 0x00, 0x14, 0xa0, 0x73, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x2a, 0x00, 0x00, 0x17, 0x32, + 0x73, 0x76, 0x00, 0x00, 0x00, 0x00, 0x02, 0x2c, + 0x00, 0x00, 0x19, 0x5c, 0x74, 0x72, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x26, 0x00, 0x00, 0x1b, 0x88, + 0x75, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x02, 0x54, + 0x00, 0x00, 0x1d, 0xae, 0x7a, 0x68, 0x54, 0x57, + 0x00, 0x00, 0x00, 0xe8, 0x00, 0x00, 0x20, 0x02, + 0x7a, 0x68, 0x43, 0x4e, 0x00, 0x00, 0x00, 0xf0, + 0x00, 0x00, 0x20, 0xea, 0x00, 0x54, 0x00, 0x68, 0x00, 0x69, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x77, @@ -17344,622 +18966,695 @@ 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x51, 0x00, 0x75, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0xe8, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x51, 0x00, 0x75, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0xe8, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x52, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, 0x00, 0x75, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x67, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6d, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x55, 0x00, 0x74, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x75, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, + 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x69, + 0x00, 0x63, 0x00, 0x68, 0x00, 0xe9, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0xe8, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x6c, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x76, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x51, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x62, 0x00, 0x62, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, 0x00, 0x75, + 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, + 0x00, 0x7a, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x77, 0x00, 0x2e, 0x00, 0x00, 0xc7, 0x74, + 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, + 0xc7, 0x7c, 0xc7, 0x40, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, + 0x00, 0x20, 0xba, 0xa8, 0xb2, 0xc8, 0xd1, 0x30, + 0xc6, 0xa9, 0xc7, 0x3c, 0xb8, 0x5c, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x75, 0x00, 0x73, 0xc5, 0xd0, 0xc1, 0x1c, + 0x00, 0x20, 0xc1, 0x24, 0xac, 0xc4, 0xd5, 0x88, + 0xc2, 0xb5, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, + 0x00, 0x20, 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, + 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, 0xc7, 0x44, + 0x00, 0x20, 0xb5, 0x14, 0xc2, 0xa4, 0xd5, 0x0c, + 0xb8, 0x08, 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x04, + 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, 0x00, 0x20, + 0xc8, 0x04, 0xc6, 0xa9, 0xc7, 0x3c, 0xb8, 0x5c, + 0x00, 0x20, 0xd6, 0x5c, 0xc6, 0xa9, 0xd5, 0x58, + 0xac, 0x70, 0xb0, 0x98, 0x00, 0x20, 0xd5, 0x04, + 0xb8, 0x5c, 0xd3, 0x0c, 0xc7, 0x7c, 0xb8, 0x5c, + 0x00, 0x20, 0xd6, 0x5c, 0xc6, 0xa9, 0xd5, 0x60, + 0x00, 0x20, 0xd3, 0xb8, 0xc9, 0xd1, 0x00, 0x20, + 0xc6, 0x01, 0xc5, 0xed, 0x00, 0x20, 0xc8, 0x04, + 0xc6, 0xa9, 0xc7, 0x3c, 0xb8, 0x5c, 0x00, 0x20, + 0xd6, 0x5c, 0xc6, 0xa9, 0xd5, 0x60, 0x00, 0x20, + 0xac, 0xbd, 0xc6, 0xb0, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0xb7, 0x91, + 0x00, 0x20, 0xb2, 0x08, 0xc5, 0xd0, 0x00, 0x20, + 0xb7, 0x44, 0xac, 0x8c, 0x00, 0x20, 0xb2, 0xec, + 0xb7, 0x7c, 0xc9, 0xc0, 0xb2, 0x94, 0x00, 0x20, + 0xac, 0x74, 0x00, 0x20, 0xc5, 0xc6, 0xc2, 0xb5, + 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x77, 0x00, 0x20, 0xba, 0xa8, 0xb2, 0xc8, + 0xd1, 0x30, 0xc5, 0xd0, 0xc1, 0x1c, 0x00, 0x20, + 0xb9, 0xcc, 0xb4, 0xe0, 0x00, 0x20, 0xc7, 0x74, + 0xbb, 0xf8, 0xc9, 0xc0, 0xb9, 0x7c, 0x00, 0x20, + 0xbc, 0xfc, 0x00, 0x20, 0xac, 0xbd, 0xc6, 0xb0, + 0xc5, 0xd0, 0xb9, 0xcc, 0x00, 0x20, 0xc7, 0x74, + 0x00, 0x20, 0xd5, 0x04, 0xb8, 0x5c, 0xd3, 0x0c, + 0xc7, 0x7c, 0x00, 0x20, 0xd6, 0x5c, 0xc6, 0xa9, + 0xc7, 0x74, 0x00, 0x20, 0xd5, 0x44, 0xc6, 0x94, + 0xd5, 0x69, 0xb2, 0xc8, 0xb2, 0xe4, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x61, 0x01, 0x42, 0x00, 0x20, 0x00, 0x7a, + 0x00, 0x61, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x77, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x7a, 0x00, 0x65, 0x00, 0x7a, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x72, 0x00, 0x6d, + 0x01, 0x19, 0x00, 0x20, 0x00, 0x52, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x75, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, + 0x00, 0x2e, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x61, + 0x00, 0x6c, 0x00, 0x65, 0x01, 0x7c, 0x00, 0x79, + 0x00, 0x20, 0x00, 0x75, 0x01, 0x7c, 0x00, 0x79, + 0x00, 0x77, 0x00, 0x61, 0x01, 0x07, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x67, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x74, 0x00, 0x79, 0x00, 0x6c, + 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6a, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x77, 0x00, 0x79, 0x01, 0x5b, 0x00, 0x77, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x74, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x62, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x72, + 0x00, 0x7a, 0x00, 0x65, 0x01, 0x44, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x64, 0x00, 0x79, 0x00, 0x63, + 0x00, 0x6a, 0x00, 0x69, 0x00, 0x2c, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, 0x00, 0x6f, + 0x00, 0x20, 0x01, 0x7c, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x63, + 0x00, 0x7a, 0x01, 0x05, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x72, 0x00, 0xf3, 0x01, 0x7c, + 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, 0x00, 0x6f, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x6f, 0x00, 0x77, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x69, 0x01, 0x19, 0x00, 0x20, + 0x00, 0x67, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x75, + 0x01, 0x7c, 0x00, 0x79, 0x00, 0x77, 0x00, 0x61, + 0x01, 0x07, 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, + 0x01, 0x42, 0x01, 0x05, 0x00, 0x63, 0x00, 0x7a, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x77, + 0x00, 0x79, 0x01, 0x5b, 0x00, 0x77, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x74, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x62, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x7a, 0x00, 0xf3, 0x00, 0x77, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x74, 0x00, 0x77, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x7a, 0x00, 0x6f, 0x00, 0x6e, + 0x00, 0x79, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x63, + 0x00, 0x68, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, + 0x00, 0x00, 0x00, 0x45, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x69, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x6a, 0x00, 0x65, 0x00, 0x74, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x65, 0x00, 0x2d, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x78, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xe3, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6d, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x70, + 0x00, 0x61, 0x00, 0xe7, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x69, 0x00, 0xe7, 0x00, 0xe3, + 0x00, 0x6f, 0x00, 0x20, 0x00, 0x6a, 0x00, 0xe1, + 0x00, 0x20, 0x00, 0x71, 0x00, 0x75, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6e, 0x00, 0xe3, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0xe9, 0x00, 0x20, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x66, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, + 0x00, 0x66, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, 0x00, 0x69, + 0x00, 0x67, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x66, + 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x74, + 0x00, 0x69, 0x00, 0x76, 0x00, 0x61, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x56, 0x00, 0x6f, 0x00, 0x63, + 0x00, 0xea, 0x00, 0x20, 0x00, 0x73, 0x00, 0xf3, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x63, 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x2c, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6f, + 0x00, 0x20, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x61, + 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x63, 0x00, 0x72, 0x00, 0x69, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x61, 0x00, 0x73, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x75, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x6d, + 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x76, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, + 0x00, 0x2e, 0x00, 0x00, 0x04, 0x2d, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x31, + 0x04, 0x4b, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x37, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x31, 0x04, 0x3e, 0x04, 0x42, 0x04, 0x30, + 0x04, 0x3d, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x38, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x30, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x77, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x2d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x34, + 0x04, 0x43, 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x4c, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x3f, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3a, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x40, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, + 0x04, 0x4f, 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, + 0x04, 0x34, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x42, + 0x04, 0x38, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x4f, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, + 0x04, 0x41, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3b, + 0x04, 0x4c, 0x04, 0x3a, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, + 0x04, 0x4b, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x43, 0x04, 0x49, 0x04, 0x35, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x32, 0x04, 0x35, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, + 0x04, 0x3b, 0x04, 0x38, 0x04, 0x47, 0x04, 0x30, + 0x04, 0x35, 0x04, 0x42, 0x04, 0x41, 0x04, 0x4f, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x12, 0x04, 0x30, + 0x04, 0x3c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x43, 0x04, 0x35, + 0x04, 0x42, 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x37, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x4d, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, + 0x04, 0x3a, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x42, 0x04, 0x40, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x37, 0x04, 0x3e, + 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x39, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3e, + 0x04, 0x37, 0x04, 0x34, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x45, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x35, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x77, 0x00, 0x2e, 0x00, 0x00, 0x04, 0x1e, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, + 0x04, 0x3c, 0x04, 0x38, 0x04, 0x41, 0x04, 0x3b, + 0x04, 0x38, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x20, + 0x04, 0x30, 0x04, 0x34, 0x04, 0x38, 0x04, 0x58, + 0x04, 0x43, 0x04, 0x41, 0x00, 0x20, 0x04, 0x37, + 0x04, 0x30, 0x00, 0x20, 0x20, 0x1e, 0x00, 0x50, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, + 0x20, 0x1c, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x40, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x1a, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x38, 0x04, 0x42, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x30, 0x04, 0x3c, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x3a, 0x04, 0x30, 0x04, 0x37, 0x04, 0x30, + 0x00, 0x20, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3e, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, + 0x00, 0x20, 0x04, 0x43, 0x04, 0x40, 0x04, 0x35, + 0x04, 0x52, 0x04, 0x38, 0x04, 0x32, 0x04, 0x30, + 0x04, 0x5a, 0x04, 0x30, 0x00, 0x20, 0x04, 0x58, + 0x04, 0x35, 0x04, 0x40, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x00, 0x20, 0x04, 0x41, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, 0x04, 0x3b, + 0x04, 0x38, 0x04, 0x3a, 0x04, 0x43, 0x04, 0x58, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x37, 0x04, 0x3d, + 0x04, 0x30, 0x04, 0x47, 0x04, 0x30, 0x04, 0x58, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3e, + 0x04, 0x34, 0x00, 0x20, 0x04, 0x41, 0x04, 0x20, + 0x04, 0x13, 0x04, 0x11, 0x00, 0x2d, 0x04, 0x30, + 0x00, 0x2e, 0x00, 0x20, 0x04, 0x22, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x31, 0x04, 0x30, 0x04, 0x3b, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x31, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, 0x00, 0x20, + 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, + 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, 0x04, 0x42, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x32, + 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, + 0x04, 0x3b, 0x00, 0x20, 0x04, 0x41, 0x04, 0x30, + 0x04, 0x3c, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x30, + 0x04, 0x3a, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, + 0x04, 0x40, 0x04, 0x35, 0x04, 0x33, 0x04, 0x3b, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, + 0x04, 0x38, 0x04, 0x3a, 0x04, 0x35, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x04, 0x3f, 0x04, 0x40, + 0x04, 0x30, 0x04, 0x32, 0x04, 0x59, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3d, + 0x04, 0x30, 0x00, 0x20, 0x20, 0x1e, 0x00, 0x50, + 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, + 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, + 0x20, 0x1c, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, + 0x04, 0x3d, 0x04, 0x38, 0x04, 0x42, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x43, 0x00, 0x2e, 0x00, 0x00, + 0x00, 0x44, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x73, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x76, 0x00, 0x20, 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x67, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6d, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x73, 0x00, 0x20, 0x00, 0x66, 0x00, 0xf6, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x55, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x69, 0x00, 0x73, 0x00, 0x75, 0x00, 0x61, - 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, - 0x00, 0x61, 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x65, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x73, 0x00, 0x70, - 0x00, 0x61, 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x69, - 0x00, 0x63, 0x00, 0x68, 0x00, 0xe9, 0x00, 0x20, - 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0xe8, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x76, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x51, 0x00, 0x75, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x6f, 0x00, 0x76, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x62, 0x00, 0x62, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x69, 0x00, 0x7a, 0x00, 0x7a, 0x00, 0x61, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6d, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x67, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, 0x00, 0x75, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x7a, - 0x00, 0x7a, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x6d, - 0x00, 0x61, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x20, 0x00, 0x63, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x75, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x63, 0x00, 0x68, 0x00, 0x65, - 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x77, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x70, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2d, + 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe4, 0x00, 0x72, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x41, 0x00, 0x6e, 0x00, 0x76, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6f, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x61, 0x01, 0x42, - 0x00, 0x20, 0x00, 0x7a, 0x00, 0x61, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x77, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, - 0x00, 0x7a, 0x00, 0x20, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x6d, 0x01, 0x19, 0x00, 0x20, - 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x75, 0x00, 0x73, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6d, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, 0x00, 0x74, - 0x00, 0x6f, 0x00, 0x72, 0x00, 0xf3, 0x00, 0x77, + 0x00, 0x6c, 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, + 0x00, 0x6d, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe4, + 0x00, 0x72, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x6c, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x69, 0x00, 0x67, 0x00, 0x65, + 0x00, 0x72, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, + 0x00, 0x73, 0x00, 0x72, 0x00, 0x79, 0x00, 0x6d, + 0x00, 0x64, 0x00, 0x20, 0x00, 0x64, 0x00, 0xe5, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, + 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0xe4, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x76, 0x00, 0xe4, + 0x00, 0x73, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0x6c, 0x00, 0x69, 0x00, 0x67, 0x00, 0x74, + 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x6f, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x75, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, + 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, + 0x00, 0x20, 0x00, 0x44, 0x00, 0x75, 0x00, 0x20, + 0x00, 0x62, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x65, 0x00, 0x68, + 0x00, 0xf6, 0x00, 0x76, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x61, 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, + 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, + 0x00, 0x61, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, + 0x00, 0x64, 0x00, 0x75, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x20, 0x00, 0x76, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0x61, 0x00, 0x70, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x73, 0x00, 0x20, 0x00, 0x70, + 0x00, 0xe5, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, 0x00, 0x20, - 0x00, 0x4e, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x65, - 0x01, 0x7c, 0x00, 0x79, 0x00, 0x20, 0x00, 0x75, - 0x01, 0x7c, 0x00, 0x79, 0x00, 0x77, 0x00, 0x61, - 0x01, 0x07, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x67, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x20, 0x00, 0x74, - 0x00, 0x79, 0x00, 0x6c, 0x00, 0x6b, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x6a, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, - 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, - 0x01, 0x5b, 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x61, 0x00, 0x20, 0x00, 0x6c, - 0x00, 0x75, 0x00, 0x62, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x72, 0x00, 0x7a, 0x00, 0x65, - 0x01, 0x44, 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, - 0x00, 0x79, 0x00, 0x63, 0x00, 0x6a, 0x00, 0x69, - 0x00, 0x2c, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x61, - 0x00, 0x6b, 0x00, 0x6f, 0x00, 0x20, 0x01, 0x7c, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x7a, 0x00, 0x6e, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x7a, 0x01, 0x05, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x72, - 0x00, 0xf3, 0x01, 0x7c, 0x00, 0x6e, 0x00, 0x79, - 0x00, 0x20, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x6f, - 0x00, 0x77, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x6e, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x69, - 0x01, 0x19, 0x00, 0x20, 0x00, 0x67, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x75, 0x01, 0x7c, 0x00, 0x79, - 0x00, 0x77, 0x00, 0x61, 0x01, 0x07, 0x00, 0x20, - 0x00, 0x77, 0x00, 0x79, 0x01, 0x42, 0x01, 0x05, - 0x00, 0x63, 0x00, 0x7a, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x77, 0x00, 0x79, 0x01, 0x5b, - 0x00, 0x77, 0x00, 0x69, 0x00, 0x65, 0x00, 0x74, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x62, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x7a, 0x00, 0xf3, - 0x00, 0x77, 0x00, 0x20, 0x00, 0x75, 0x00, 0x74, - 0x00, 0x77, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x7a, - 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79, 0x00, 0x63, - 0x00, 0x68, 0x00, 0x20, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x63, 0x00, 0x68, 0x00, 0x20, - 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x77, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x45, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x6f, 0x00, 0x69, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6a, 0x00, 0x65, - 0x00, 0x74, 0x00, 0x61, 0x00, 0x64, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x52, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x73, 0x00, 0x76, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x77, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x65, 0x00, 0x2d, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x77, 0x00, 0x2d, 0x00, 0x73, + 0x00, 0x6b, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x6d, + 0x00, 0x2e, 0x00, 0x00, 0x00, 0x42, 0x00, 0x75, + 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x78, 0x00, 0x69, 0x00, 0x62, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x75, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x75, 0x00, 0x6d, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x70, 0x00, 0x61, 0x00, 0xe7, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, - 0x00, 0xe7, 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0xe1, 0x00, 0x20, 0x00, 0x71, - 0x00, 0x75, 0x00, 0x65, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6e, - 0x00, 0xe3, 0x00, 0x6f, 0x00, 0x20, 0x00, 0xe9, - 0x00, 0x20, 0x00, 0x64, 0x00, 0x69, 0x00, 0x66, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x6f, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, 0x00, 0x6f, - 0x00, 0x72, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x66, 0x00, 0x69, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x76, - 0x00, 0x61, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x56, - 0x00, 0x6f, 0x00, 0x63, 0x00, 0xea, 0x00, 0x20, - 0x00, 0x73, 0x00, 0xf3, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x63, 0x00, 0x69, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x2c, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x6f, 0x00, 0x20, 0x00, 0x76, - 0x00, 0x65, 0x00, 0x72, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6d, 0x00, 0x61, 0x00, 0x67, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x73, 0x00, 0x20, 0x00, 0x63, - 0x00, 0x72, 0x00, 0x69, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x73, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x75, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x6d, 0x00, 0x6f, 0x00, 0x6e, - 0x00, 0x69, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, + 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x20, 0x00, 0x74, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x66, + 0x01, 0x31, 0x00, 0x6e, 0x00, 0x64, 0x00, 0x61, + 0x00, 0x6e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x20, + 0x00, 0x65, 0x00, 0x6b, 0x00, 0x72, 0x00, 0x61, + 0x00, 0x6e, 0x01, 0x31, 0x00, 0x20, 0x00, 0x69, + 0x00, 0xe7, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x20, + 0x00, 0x74, 0x00, 0x61, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x72, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x6d, 0x01, 0x31, 0x01, 0x5f, 0x00, 0x74, + 0x01, 0x31, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, + 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, + 0x00, 0x20, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, 0x00, 0x7a, + 0x00, 0x6c, 0x00, 0x61, 0x00, 0x20, 0x00, 0x66, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x6b, 0x01, 0x31, + 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6d, + 0x00, 0x61, 0x00, 0x64, 0x01, 0x31, 0x01, 0x1f, + 0x01, 0x31, 0x00, 0x20, 0x00, 0x67, 0x00, 0x69, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, + 0x00, 0x72, 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, + 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x74, + 0x00, 0xfc, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x79, 0x00, 0x61, + 0x00, 0x20, 0x00, 0x64, 0x00, 0x61, 0x00, 0x20, + 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, + 0x00, 0x64, 0x00, 0xfc, 0x00, 0x7a, 0x00, 0x65, + 0x00, 0x6e, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6d, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, 0x00, 0x20, + 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, + 0x00, 0x61, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x6b, + 0x00, 0x75, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x61, + 0x00, 0x6e, 0x01, 0x31, 0x00, 0x6c, 0x01, 0x31, + 0x00, 0x72, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x42, + 0x00, 0x75, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, + 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, + 0x00, 0x69, 0x00, 0x20, 0x00, 0x73, 0x00, 0x61, + 0x00, 0x64, 0x00, 0x65, 0x00, 0x63, 0x00, 0x65, + 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, + 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, + 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x77, 0x00, 0x20, 0x00, 0x69, + 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x79, + 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, + 0x01, 0x31, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, + 0x00, 0x20, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x6d, 0x00, 0x69, 0x00, 0x20, 0x00, 0x67, + 0x00, 0xf6, 0x00, 0x72, 0x00, 0xfc, 0x00, 0x6e, + 0x00, 0x74, 0x00, 0xfc, 0x00, 0x6c, 0x00, 0x65, + 0x00, 0x6d, 0x00, 0x65, 0x00, 0x6b, 0x00, 0x20, + 0x00, 0x69, 0x00, 0x73, 0x00, 0x74, 0x00, 0x65, + 0x00, 0x64, 0x00, 0x69, 0x01, 0x1f, 0x00, 0x69, + 0x00, 0x6e, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x64, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x69, 0x00, 0x68, + 0x00, 0x74, 0x00, 0x69, 0x00, 0x79, 0x00, 0x61, + 0x00, 0x63, 0x01, 0x31, 0x00, 0x6e, 0x01, 0x31, + 0x00, 0x7a, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, + 0x00, 0x61, 0x00, 0x63, 0x00, 0x61, 0x00, 0x6b, + 0x00, 0x74, 0x01, 0x31, 0x00, 0x72, 0x00, 0x2e, + 0x00, 0x00, 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, + 0x00, 0x20, 0x04, 0x31, 0x04, 0x43, 0x04, 0x3b, + 0x04, 0x3e, 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x32, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x35, + 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, 0x04, 0x30, + 0x04, 0x3d, 0x04, 0x56, 0x04, 0x54, 0x04, 0x4e, + 0x00, 0x20, 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, + 0x00, 0x69, 0x00, 0x75, 0x00, 0x73, 0x00, 0x20, + 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x56, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x30, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x76, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, 0x00, 0x00, - 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x42, + 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, + 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, 0x00, 0x20, + 0x04, 0x26, 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, + 0x04, 0x41, 0x04, 0x3b, 0x04, 0x56, 0x04, 0x34, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x38, 0x04, 0x3a, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x43, + 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, + 0x00, 0x20, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x48, + 0x04, 0x35, 0x00, 0x20, 0x04, 0x4f, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x31, 0x04, 0x4b, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, 0x04, 0x37, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x31, 0x04, 0x3e, - 0x04, 0x42, 0x04, 0x30, 0x04, 0x3d, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, 0x04, 0x3f, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x38, 0x04, 0x35, - 0x04, 0x39, 0x00, 0x20, 0x00, 0x52, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x75, 0x00, 0x73, + 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x30, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x2d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x34, 0x04, 0x43, 0x04, 0x35, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x37, 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x42, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, - 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x38, - 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3f, + 0x00, 0x20, 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x3a, + 0x04, 0x30, 0x04, 0x37, 0x04, 0x43, 0x00, 0x20, + 0x04, 0x30, 0x04, 0x31, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x4f, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x40, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x41, - 0x04, 0x42, 0x04, 0x32, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, - 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, - 0x04, 0x3a, 0x04, 0x42, 0x04, 0x38, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x4f, 0x00, 0x2c, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3a, - 0x04, 0x3e, 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x34, 0x04, 0x30, - 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, 0x04, 0x39, + 0x04, 0x56, 0x04, 0x40, 0x00, 0x20, 0x04, 0x34, + 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x34, 0x04, 0x30, 0x04, 0x33, + 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, 0x04, 0x3d, + 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x2c, 0x00, 0x20, + 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3a, 0x04, 0x56, + 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x43, 0x04, 0x49, - 0x04, 0x35, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x3e, + 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x42, 0x04, 0x3b, 0x04, 0x38, - 0x04, 0x47, 0x04, 0x30, 0x04, 0x35, 0x04, 0x42, - 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x12, 0x04, 0x30, 0x04, 0x3c, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x34, - 0x04, 0x43, 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x3f, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x37, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, 0x04, 0x4c, - 0x00, 0x20, 0x04, 0x4d, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x42, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x3b, 0x04, 0x4c, 0x04, 0x3a, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x38, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x42, - 0x04, 0x40, 0x04, 0x35, 0x00, 0x20, 0x04, 0x38, + 0x04, 0x34, 0x04, 0x43, 0x04, 0x36, 0x04, 0x35, + 0x00, 0x20, 0x04, 0x32, 0x04, 0x56, 0x04, 0x34, + 0x04, 0x40, 0x04, 0x56, 0x04, 0x37, 0x04, 0x3d, + 0x04, 0x4f, 0x04, 0x54, 0x04, 0x42, 0x04, 0x4c, + 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x32, + 0x04, 0x56, 0x04, 0x34, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x2e, + 0x00, 0x20, 0x04, 0x12, 0x04, 0x30, 0x04, 0x3c, + 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, 0x04, 0x56, + 0x04, 0x34, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, + 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, + 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, 0x04, 0x42, + 0x04, 0x38, 0x04, 0x41, 0x04, 0x4f, 0x00, 0x20, + 0x04, 0x46, 0x04, 0x38, 0x04, 0x3c, 0x00, 0x20, + 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, + 0x04, 0x56, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x3c, + 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3b, 0x04, 0x38, + 0x04, 0x48, 0x04, 0x35, 0x00, 0x20, 0x04, 0x4f, + 0x04, 0x3a, 0x04, 0x49, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x37, 0x04, 0x3e, 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x39, 0x00, 0x2c, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x3e, 0x04, 0x37, 0x04, 0x34, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4b, - 0x04, 0x45, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, - 0x04, 0x38, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x35, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, - 0x00, 0x00, 0x04, 0x1e, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x58, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x41, 0x04, 0x3c, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x20, 0x04, 0x30, 0x04, 0x34, - 0x04, 0x38, 0x04, 0x58, 0x04, 0x43, 0x04, 0x41, - 0x00, 0x20, 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, - 0x20, 0x1e, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x77, 0x20, 0x1c, 0x00, 0x20, - 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, 0x00, 0x2e, - 0x00, 0x20, 0x04, 0x1a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x38, - 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x30, 0x04, 0x3c, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, - 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x38, 0x04, 0x3a, 0x04, 0x30, - 0x04, 0x37, 0x04, 0x30, 0x00, 0x20, 0x04, 0x38, - 0x04, 0x3b, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3a, - 0x04, 0x30, 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x3e, 0x04, 0x40, 0x00, 0x20, 0x04, 0x43, - 0x04, 0x40, 0x04, 0x35, 0x04, 0x52, 0x04, 0x38, - 0x04, 0x32, 0x04, 0x30, 0x04, 0x5a, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x58, 0x04, 0x35, 0x04, 0x40, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x35, 0x00, 0x20, 0x04, 0x3d, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x40, 0x04, 0x30, - 0x04, 0x37, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3a, - 0x04, 0x43, 0x04, 0x58, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x37, 0x04, 0x3d, 0x04, 0x30, 0x04, 0x47, - 0x04, 0x30, 0x04, 0x58, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3e, 0x04, 0x34, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x20, 0x04, 0x13, 0x04, 0x11, - 0x00, 0x2d, 0x04, 0x30, 0x00, 0x2e, 0x00, 0x20, - 0x04, 0x22, 0x04, 0x40, 0x04, 0x35, 0x04, 0x31, - 0x04, 0x30, 0x04, 0x3b, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x31, 0x04, 0x38, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x30, 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, - 0x04, 0x38, 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x3e, 0x04, 0x32, 0x04, 0x30, 0x04, 0x58, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x44, 0x04, 0x38, 0x04, 0x3b, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x30, 0x04, 0x3c, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x30, 0x04, 0x3a, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x35, - 0x04, 0x33, 0x04, 0x3b, 0x04, 0x35, 0x04, 0x34, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x3b, 0x04, 0x38, 0x04, 0x3a, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, - 0x04, 0x3f, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, - 0x04, 0x59, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, - 0x20, 0x1e, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x77, 0x20, 0x1c, 0x00, 0x20, - 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x38, - 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x43, - 0x00, 0x2e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x69, 0x00, 0x67, - 0x00, 0x6e, 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x20, 0x00, 0x61, 0x00, 0x76, - 0x00, 0x20, 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x69, 0x00, 0x75, 0x00, 0x73, 0x00, 0x20, - 0x00, 0x66, 0x00, 0xf6, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, - 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x77, 0x00, 0x2d, 0x00, 0x73, 0x00, 0x6b, - 0x00, 0xe4, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x41, - 0x00, 0x6e, 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, - 0x00, 0x66, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x73, - 0x00, 0x6b, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x6d, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x65, - 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x65, 0x00, 0x72, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x67, 0x00, 0x73, 0x00, 0x72, - 0x00, 0x79, 0x00, 0x6d, 0x00, 0x64, 0x00, 0x20, - 0x00, 0x64, 0x00, 0xe5, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x65, - 0x00, 0x20, 0x00, 0xe4, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x76, 0x00, 0xe4, 0x00, 0x73, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0x6c, 0x00, 0x69, - 0x00, 0x67, 0x00, 0x74, 0x00, 0x20, 0x00, 0x61, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x72, - 0x00, 0x6c, 0x00, 0x75, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x20, 0x00, 0xe4, 0x00, 0x6e, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2e, 0x00, 0x20, 0x00, 0x44, - 0x00, 0x75, 0x00, 0x20, 0x00, 0x62, 0x00, 0xf6, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x62, 0x00, 0x61, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x65, 0x00, 0x68, 0x00, 0xf6, 0x00, 0x76, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x61, 0x00, 0x6e, - 0x00, 0x76, 0x00, 0xe4, 0x00, 0x6e, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x6e, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x6d, 0x00, 0x20, 0x00, 0x64, 0x00, 0x75, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x76, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x64, 0x00, 0x65, 0x00, 0x72, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6d, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x6b, 0x00, 0x61, - 0x00, 0x70, 0x00, 0x61, 0x00, 0x74, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x70, 0x00, 0xe5, 0x00, 0x20, - 0x00, 0x65, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x50, - 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, - 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, - 0x00, 0x2d, 0x00, 0x73, 0x00, 0x6b, 0x00, 0xe4, - 0x00, 0x72, 0x00, 0x6d, 0x00, 0x2e, 0x00, 0x00, - 0x00, 0x42, 0x00, 0x75, 0x00, 0x20, 0x00, 0x70, - 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x20, 0x00, 0x52, 0x00, 0x61, - 0x00, 0x64, 0x00, 0x69, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x66, 0x01, 0x31, 0x00, 0x6e, - 0x00, 0x64, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x41, + 0x04, 0x42, 0x04, 0x32, 0x04, 0x3e, 0x04, 0x40, + 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3e, 0x00, 0x20, + 0x04, 0x3d, 0x04, 0x30, 0x00, 0x20, 0x04, 0x3c, + 0x04, 0x3e, 0x04, 0x3d, 0x04, 0x56, 0x04, 0x42, + 0x04, 0x3e, 0x04, 0x40, 0x04, 0x56, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, - 0x00, 0x77, 0x00, 0x20, 0x00, 0x65, 0x00, 0x6b, - 0x00, 0x72, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, - 0x00, 0x20, 0x00, 0x69, 0x00, 0xe7, 0x00, 0x69, - 0x00, 0x6e, 0x00, 0x20, 0x00, 0x74, 0x00, 0x61, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x6d, 0x01, 0x31, - 0x01, 0x5f, 0x00, 0x74, 0x01, 0x31, 0x00, 0x72, - 0x00, 0x2e, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, - 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x00, 0x69, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x66, - 0x00, 0x61, 0x00, 0x7a, 0x00, 0x6c, 0x00, 0x61, - 0x00, 0x20, 0x00, 0x66, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x6b, 0x01, 0x31, 0x00, 0x20, 0x00, 0x6f, - 0x00, 0x6c, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x64, - 0x01, 0x31, 0x01, 0x1f, 0x01, 0x31, 0x00, 0x20, - 0x00, 0x67, 0x00, 0x69, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, - 0x00, 0x65, 0x00, 0x63, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x62, 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, - 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, 0x00, 0xfc, - 0x00, 0x6e, 0x00, 0x74, 0x00, 0xfc, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x79, 0x00, 0x61, 0x00, 0x20, 0x00, 0x64, - 0x00, 0x61, 0x00, 0x20, 0x00, 0x62, 0x00, 0x69, - 0x00, 0x72, 0x00, 0x20, 0x00, 0x64, 0x00, 0xfc, - 0x00, 0x7a, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x6c, - 0x00, 0x65, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x61, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, - 0x01, 0x31, 0x00, 0x20, 0x00, 0x6f, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6b, - 0x00, 0x20, 0x00, 0x6b, 0x00, 0x75, 0x00, 0x6c, - 0x00, 0x6c, 0x00, 0x61, 0x00, 0x6e, 0x01, 0x31, - 0x00, 0x6c, 0x01, 0x31, 0x00, 0x72, 0x00, 0x2e, - 0x00, 0x20, 0x00, 0x42, 0x00, 0x75, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x66, - 0x00, 0x69, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, - 0x00, 0x63, 0x00, 0x65, 0x00, 0x20, 0x00, 0x62, - 0x00, 0x69, 0x00, 0x72, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x77, 0x00, 0x2e, 0x00, 0x00, 0x6b, 0x64, + 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x75, 0x76, + 0x52, 0x1d, 0x66, 0x2f, 0x75, 0x31, 0x00, 0x20, + 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, + 0x00, 0x75, 0x00, 0x73, 0x00, 0x20, 0x8a, 0x2d, + 0x8a, 0x08, 0x7d, 0x66, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, - 0x00, 0x20, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, - 0x00, 0x20, 0x00, 0x79, 0x00, 0x61, 0x00, 0x72, - 0x00, 0x61, 0x00, 0x74, 0x01, 0x31, 0x00, 0x6c, - 0x00, 0x61, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, - 0x00, 0x20, 0x00, 0x67, 0x00, 0xf6, 0x00, 0x72, - 0x00, 0xfc, 0x00, 0x6e, 0x00, 0x74, 0x00, 0xfc, - 0x00, 0x6c, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x65, - 0x00, 0x6b, 0x00, 0x20, 0x00, 0x69, 0x00, 0x73, - 0x00, 0x74, 0x00, 0x65, 0x00, 0x64, 0x00, 0x69, - 0x01, 0x1f, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, - 0x00, 0x7a, 0x00, 0x64, 0x00, 0x65, 0x00, 0x20, - 0x00, 0x69, 0x00, 0x68, 0x00, 0x74, 0x00, 0x69, - 0x00, 0x79, 0x00, 0x61, 0x00, 0x63, 0x01, 0x31, - 0x00, 0x6e, 0x01, 0x31, 0x00, 0x7a, 0x00, 0x20, - 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, - 0x00, 0x61, 0x00, 0x6b, 0x00, 0x74, 0x01, 0x31, - 0x00, 0x72, 0x00, 0x2e, 0x00, 0x00, 0x04, 0x26, - 0x04, 0x35, 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, - 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x31, - 0x04, 0x43, 0x04, 0x3b, 0x04, 0x3e, 0x00, 0x20, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3e, - 0x00, 0x20, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x3c, - 0x04, 0x3f, 0x04, 0x30, 0x04, 0x3d, 0x04, 0x56, - 0x04, 0x54, 0x04, 0x4e, 0x00, 0x20, 0x00, 0x52, - 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, 0x00, 0x75, - 0x00, 0x73, 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, - 0x04, 0x3d, 0x04, 0x56, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x40, 0x04, 0x30, 0x00, 0x20, 0x00, 0x50, + 0x00, 0x20, 0x87, 0xa2, 0x5e, 0x55, 0x4f, 0x7f, + 0x75, 0x28, 0x30, 0x02, 0x56, 0xe0, 0x51, 0x76, + 0x82, 0x07, 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, + 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, 0x71, 0x21, + 0x91, 0xcd, 0x59, 0x27, 0x5d, 0xee, 0x75, 0x70, + 0xff, 0x0c, 0x8a, 0xcb, 0x53, 0xea, 0x5c, 0x07, + 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, + 0x75, 0x28, 0x4f, 0x5c, 0x98, 0x6f, 0x79, 0x3a, + 0x56, 0x68, 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, + 0xff, 0x0c, 0x62, 0x16, 0x75, 0x28, 0x4f, 0x5c, + 0x7d, 0xe8, 0x8f, 0x2f, 0x75, 0x28, 0x7a, 0x7a, + 0x95, 0x93, 0x30, 0x02, 0x60, 0xa8, 0x61, 0xc9, + 0x8a, 0x72, 0x53, 0xea, 0x97, 0x00, 0x89, 0x81, + 0x57, 0x28, 0x6a, 0xa2, 0x89, 0x96, 0x90, 0xa3, + 0x4e, 0x9b, 0x57, 0x28, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, - 0x00, 0x2e, 0x00, 0x20, 0x04, 0x26, 0x04, 0x35, - 0x04, 0x39, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, - 0x04, 0x4c, 0x00, 0x20, 0x04, 0x41, 0x04, 0x3b, - 0x04, 0x56, 0x04, 0x34, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x38, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x38, 0x04, 0x41, 0x04, 0x42, 0x04, 0x3e, - 0x04, 0x32, 0x04, 0x43, 0x04, 0x32, 0x04, 0x30, - 0x04, 0x42, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3b, - 0x04, 0x38, 0x04, 0x48, 0x04, 0x35, 0x00, 0x20, - 0x04, 0x4f, 0x04, 0x3a, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, - 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x34, - 0x04, 0x3b, 0x04, 0x4f, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x3e, 0x04, 0x3a, 0x04, 0x30, 0x04, 0x37, - 0x04, 0x43, 0x00, 0x20, 0x04, 0x30, 0x04, 0x31, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x4f, 0x04, 0x3a, - 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, 0x04, 0x3e, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x56, 0x04, 0x40, - 0x00, 0x20, 0x04, 0x34, 0x04, 0x3b, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x40, 0x04, 0x35, 0x04, 0x34, - 0x04, 0x30, 0x04, 0x33, 0x04, 0x43, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, - 0x00, 0x2c, 0x00, 0x20, 0x04, 0x3e, 0x04, 0x41, - 0x04, 0x3a, 0x04, 0x56, 0x04, 0x3b, 0x04, 0x4c, - 0x04, 0x3a, 0x04, 0x38, 0x00, 0x20, 0x04, 0x3f, - 0x04, 0x40, 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, - 0x04, 0x3b, 0x04, 0x4c, 0x00, 0x20, 0x04, 0x3d, - 0x04, 0x35, 0x00, 0x20, 0x04, 0x34, 0x04, 0x43, - 0x04, 0x36, 0x04, 0x35, 0x00, 0x20, 0x04, 0x32, - 0x04, 0x56, 0x04, 0x34, 0x04, 0x40, 0x04, 0x56, - 0x04, 0x37, 0x04, 0x3d, 0x04, 0x4f, 0x04, 0x54, - 0x04, 0x42, 0x04, 0x4c, 0x04, 0x41, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x32, 0x04, 0x56, 0x04, 0x34, - 0x00, 0x20, 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, - 0x00, 0x42, 0x00, 0x2e, 0x00, 0x20, 0x04, 0x12, - 0x04, 0x30, 0x04, 0x3c, 0x00, 0x20, 0x04, 0x41, - 0x04, 0x3b, 0x04, 0x56, 0x04, 0x34, 0x00, 0x20, - 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x40, 0x04, 0x38, - 0x04, 0x41, 0x04, 0x42, 0x04, 0x43, 0x04, 0x32, - 0x04, 0x30, 0x04, 0x42, 0x04, 0x38, 0x04, 0x41, - 0x04, 0x4f, 0x00, 0x20, 0x04, 0x46, 0x04, 0x38, - 0x04, 0x3c, 0x00, 0x20, 0x04, 0x3f, 0x04, 0x40, - 0x04, 0x3e, 0x04, 0x44, 0x04, 0x56, 0x04, 0x3b, - 0x04, 0x35, 0x04, 0x3c, 0x00, 0x2c, 0x00, 0x20, - 0x04, 0x3b, 0x04, 0x38, 0x04, 0x48, 0x04, 0x35, - 0x00, 0x20, 0x04, 0x4f, 0x04, 0x3a, 0x04, 0x49, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x37, 0x04, 0x3e, - 0x04, 0x31, 0x04, 0x40, 0x04, 0x30, 0x04, 0x36, - 0x04, 0x35, 0x04, 0x3d, 0x04, 0x3d, 0x04, 0x4f, - 0x00, 0x20, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, - 0x04, 0x3e, 0x04, 0x40, 0x04, 0x35, 0x04, 0x3d, - 0x04, 0x3e, 0x00, 0x20, 0x04, 0x3d, 0x04, 0x30, - 0x00, 0x20, 0x04, 0x3c, 0x04, 0x3e, 0x04, 0x3d, - 0x04, 0x56, 0x04, 0x42, 0x04, 0x3e, 0x04, 0x40, - 0x04, 0x56, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, - 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, - 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x2e, - 0x00, 0x00, 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, - 0x6a, 0x94, 0x75, 0x76, 0x52, 0x1d, 0x66, 0x2f, + 0x00, 0x20, 0x87, 0xa2, 0x5e, 0x55, 0x4e, 0x0a, + 0x62, 0x40, 0x5e, 0xfa, 0x7a, 0xcb, 0x76, 0x84, + 0x5f, 0x71, 0x50, 0xcf, 0x66, 0x42, 0x4f, 0x7f, + 0x75, 0x28, 0x6b, 0x64, 0x63, 0xcf, 0x8f, 0xf0, + 0x6a, 0x94, 0x30, 0x02, 0x00, 0x00, 0x8b, 0xe5, + 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, 0x4e, 0xf6, 0x75, 0x31, 0x00, 0x20, 0x00, 0x52, 0x00, 0x61, 0x00, 0x64, 0x00, 0x69, 0x00, 0x75, 0x00, 0x73, - 0x00, 0x20, 0x8a, 0x2d, 0x8a, 0x08, 0x7d, 0x66, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x77, 0x00, 0x20, 0x87, 0xa2, - 0x5e, 0x55, 0x4f, 0x7f, 0x75, 0x28, 0x30, 0x02, - 0x56, 0xe0, 0x51, 0x76, 0x82, 0x07, 0x00, 0x20, - 0x00, 0x73, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, - 0x00, 0x20, 0x71, 0x21, 0x91, 0xcd, 0x59, 0x27, - 0x5d, 0xee, 0x75, 0x70, 0xff, 0x0c, 0x8a, 0xcb, - 0x53, 0xea, 0x5c, 0x07, 0x6b, 0x64, 0x63, 0xcf, - 0x8f, 0xf0, 0x6a, 0x94, 0x75, 0x28, 0x4f, 0x5c, - 0x98, 0x6f, 0x79, 0x3a, 0x56, 0x68, 0x63, 0xcf, - 0x8f, 0xf0, 0x6a, 0x94, 0xff, 0x0c, 0x62, 0x16, - 0x75, 0x28, 0x4f, 0x5c, 0x7d, 0xe8, 0x8f, 0x2f, - 0x75, 0x28, 0x7a, 0x7a, 0x95, 0x93, 0x30, 0x02, - 0x60, 0xa8, 0x61, 0xc9, 0x8a, 0x72, 0x53, 0xea, - 0x97, 0x00, 0x89, 0x81, 0x57, 0x28, 0x6a, 0xa2, - 0x89, 0x96, 0x90, 0xa3, 0x4e, 0x9b, 0x57, 0x28, - 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, - 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, - 0x00, 0x65, 0x00, 0x77, 0x00, 0x20, 0x87, 0xa2, - 0x5e, 0x55, 0x4e, 0x0a, 0x62, 0x40, 0x5e, 0xfa, - 0x7a, 0xcb, 0x76, 0x84, 0x5f, 0x71, 0x50, 0xcf, - 0x66, 0x42, 0x4f, 0x7f, 0x75, 0x28, 0x6b, 0x64, - 0x63, 0xcf, 0x8f, 0xf0, 0x6a, 0x94, 0x30, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29 + 0x00, 0x20, 0x8b, 0xbe, 0x8b, 0xa1, 0x75, 0x28, + 0x4e, 0x8e, 0x00, 0x20, 0x00, 0x50, 0x00, 0x72, + 0x00, 0x65, 0x00, 0x73, 0x00, 0x73, 0x00, 0x56, + 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x20, + 0x66, 0x3e, 0x79, 0x3a, 0x56, 0x68, 0x30, 0x02, + 0x8b, 0xe5, 0x65, 0x87, 0x4e, 0xf6, 0x4e, 0xc5, + 0x75, 0x28, 0x4e, 0x8e, 0x66, 0x3e, 0x79, 0x3a, + 0x56, 0x68, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0xff, 0x1b, 0x59, 0x82, 0x67, 0x9c, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x4e, 0x0e, 0x00, 0x20, 0x00, 0x73, + 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x20, + 0x53, 0x3a, 0x52, 0x2b, 0x4e, 0x0d, 0x59, 0x27, + 0x76, 0x84, 0x8b, 0xdd, 0xff, 0x0c, 0x4e, 0x5f, + 0x4f, 0x1a, 0x75, 0x28, 0x4e, 0x8e, 0x7f, 0x16, + 0x8f, 0x91, 0x65, 0xf6, 0x76, 0x84, 0x82, 0x72, + 0x5f, 0x69, 0x7a, 0x7a, 0x95, 0xf4, 0x30, 0x02, + 0x60, 0xa8, 0x53, 0xea, 0x67, 0x09, 0x57, 0x28, + 0x6d, 0x4f, 0x89, 0xc8, 0x75, 0x28, 0x00, 0x20, + 0x00, 0x50, 0x00, 0x72, 0x00, 0x65, 0x00, 0x73, + 0x00, 0x73, 0x00, 0x56, 0x00, 0x69, 0x00, 0x65, + 0x00, 0x77, 0x00, 0x20, 0x66, 0x3e, 0x79, 0x3a, + 0x56, 0x68, 0x52, 0x1b, 0x5e, 0xfa, 0x76, 0x84, + 0x56, 0xfe, 0x50, 0xcf, 0x65, 0xf6, 0xff, 0x0c, + 0x62, 0x4d, 0x4f, 0x1a, 0x75, 0x28, 0x52, 0x30, + 0x8b, 0xe5, 0x91, 0x4d, 0x7f, 0x6e, 0x65, 0x87, + 0x4e, 0xf6, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29 } }; static GStaticResource static_resource = { cd_resource_data.data, sizeof (cd_resource_data.data), NULL, NULL, NULL }; diff -Nru colord-1.2.12/src/cd-sensor.c colord-1.3.2/src/cd-sensor.c --- colord-1.2.12/src/cd-sensor.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/cd-sensor.c 2015-10-27 10:16:08.000000000 +0000 @@ -27,13 +27,12 @@ #include #include -#include "cd-cleanup.h" #include "cd-common.h" #include "cd-sensor.h" static void cd_sensor_finalize (GObject *object); -#define CD_SENSOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_SENSOR, CdSensorPrivate)) +#define GET_PRIVATE(o) (cd_sensor_get_instance_private (o)) /** * CdSensorIface: @@ -47,6 +46,14 @@ CdColorXYZ *(*get_sample_finish) (CdSensor *sensor, GAsyncResult *res, GError **error); + void (*get_spectrum_async) (CdSensor *sensor, + CdSensorCap cap, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + CdSpectrum *(*get_spectrum_finish) (CdSensor *sensor, + GAsyncResult *res, + GError **error); gboolean (*coldplug) (CdSensor *sensor, GError **error); gboolean (*dump_device) (CdSensor *sensor, @@ -81,7 +88,7 @@ * * Private #CdSensor data **/ -struct _CdSensorPrivate +typedef struct { gchar *id; CdSensorKind kind; @@ -101,13 +108,14 @@ guint watcher_id; GDBusConnection *connection; guint registration_id; + guint set_state_id; CdSensorIface *desc; GHashTable *options; GHashTable *metadata; #ifdef HAVE_GUSB GUsbContext *usb_ctx; #endif -}; +} CdSensorPrivate; enum { PROP_0, @@ -125,7 +133,7 @@ PROP_LAST }; -G_DEFINE_TYPE (CdSensor, cd_sensor, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdSensor, cd_sensor, G_TYPE_OBJECT) /** * cd_sensor_error_quark: @@ -152,8 +160,9 @@ const gchar * cd_sensor_get_object_path (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - return sensor->priv->object_path; + return priv->object_path; } /** @@ -162,8 +171,9 @@ const gchar * cd_sensor_get_id (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - return sensor->priv->id; + return priv->id; } /** @@ -172,18 +182,19 @@ static void cd_sensor_set_id (CdSensor *sensor, const gchar *id) { - _cleanup_free_ gchar *id_tmp = NULL; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + g_autofree gchar *id_tmp = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - g_free (sensor->priv->id); + g_free (priv->id); /* make sure object path is sane */ id_tmp = cd_main_ensure_dbus_path (id); - sensor->priv->object_path = g_build_filename (COLORD_DBUS_PATH, + priv->object_path = g_build_filename (COLORD_DBUS_PATH, "sensors", id_tmp, NULL); - sensor->priv->id = g_strdup (id); + priv->id = g_strdup (id); } /** @@ -194,11 +205,12 @@ const gchar *property_name, GVariant *property_value) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); GVariantBuilder builder; GVariantBuilder invalidated_builder; /* not yet connected */ - if (sensor->priv->connection == NULL) + if (priv->connection == NULL) return; /* build the dict */ @@ -209,9 +221,9 @@ property_name, property_value); g_debug ("CdSensor: emit PropertiesChanged(%s)", property_name); - g_dbus_connection_emit_signal (sensor->priv->connection, + g_dbus_connection_emit_signal (priv->connection, NULL, - sensor->priv->object_path, + priv->object_path, "org.freedesktop.DBus.Properties", "PropertiesChanged", g_variant_new ("(sa{sv}as)", @@ -231,16 +243,18 @@ void cd_sensor_button_pressed (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); + /* not yet connected */ - if (sensor->priv->connection == NULL) + if (priv->connection == NULL) return; /* emit signal */ g_debug ("CdSensor: emit ButtonPressed on %s", - sensor->priv->object_path); - g_dbus_connection_emit_signal (sensor->priv->connection, + priv->object_path); + g_dbus_connection_emit_signal (priv->connection, NULL, - sensor->priv->object_path, + priv->object_path, COLORD_DBUS_INTERFACE_SENSOR, "ButtonPressed", NULL, @@ -258,8 +272,9 @@ void cd_sensor_set_serial (CdSensor *sensor, const gchar *serial) { - g_free (sensor->priv->serial); - sensor->priv->serial = g_strdup (serial); + CdSensorPrivate *priv = GET_PRIVATE (sensor); + g_free (priv->serial); + priv->serial = g_strdup (serial); cd_sensor_dbus_emit_property_changed (sensor, "Serial", g_variant_new_string (serial)); @@ -275,7 +290,8 @@ void cd_sensor_set_kind (CdSensor *sensor, CdSensorKind kind) { - sensor->priv->kind = kind; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + priv->kind = kind; cd_sensor_dbus_emit_property_changed (sensor, "Kind", g_variant_new_uint32 (kind)); @@ -287,7 +303,8 @@ CdSensorKind cd_sensor_get_kind (CdSensor *sensor) { - return sensor->priv->kind; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + return priv->kind; } /** @@ -300,25 +317,26 @@ gboolean cd_sensor_load (CdSensor *sensor, GError **error) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); CdSensorIface *desc; GModule *handle; const gchar *module_name; - _cleanup_free_ gchar *backend_name = NULL; - _cleanup_free_ gchar *path_fallback = NULL; - _cleanup_free_ gchar *path = NULL; + g_autofree gchar *backend_name = NULL; + g_autofree gchar *path_fallback = NULL; + g_autofree gchar *path = NULL; /* no module */ - if (sensor->priv->kind == CD_SENSOR_KIND_UNKNOWN) + if (priv->kind == CD_SENSOR_KIND_UNKNOWN) return TRUE; /* some modules are shared */ - switch (sensor->priv->kind) { + switch (priv->kind) { case CD_SENSOR_KIND_COLORHUG: case CD_SENSOR_KIND_COLORHUG2: module_name = "colorhug"; break; default: - module_name = cd_sensor_kind_to_string (sensor->priv->kind); + module_name = cd_sensor_kind_to_string (priv->kind); break; } @@ -346,11 +364,13 @@ } /* dlload module if it exists */ - desc = sensor->priv->desc = g_new0 (CdSensorIface, 1); + desc = priv->desc = g_new0 (CdSensorIface, 1); /* connect up exported methods */ g_module_symbol (handle, "cd_sensor_get_sample_async", (gpointer *)&desc->get_sample_async); g_module_symbol (handle, "cd_sensor_get_sample_finish", (gpointer *)&desc->get_sample_finish); + g_module_symbol (handle, "cd_sensor_get_spectrum_async", (gpointer *)&desc->get_spectrum_async); + g_module_symbol (handle, "cd_sensor_get_spectrum_finish", (gpointer *)&desc->get_spectrum_finish); g_module_symbol (handle, "cd_sensor_set_options_async", (gpointer *)&desc->set_options_async); g_module_symbol (handle, "cd_sensor_set_options_finish", (gpointer *)&desc->set_options_finish); g_module_symbol (handle, "cd_sensor_coldplug", (gpointer *)&desc->coldplug); @@ -372,7 +392,8 @@ static void cd_sensor_set_locked (CdSensor *sensor, gboolean locked) { - sensor->priv->locked = locked; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + priv->locked = locked; cd_sensor_dbus_emit_property_changed (sensor, "Locked", g_variant_new_boolean (locked)); @@ -390,12 +411,14 @@ GAsyncReadyCallback callback, gpointer user_data) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); + g_return_if_fail (CD_IS_SENSOR (sensor)); - g_return_if_fail (sensor->priv->desc != NULL); + g_return_if_fail (priv->desc != NULL); /* proxy up */ - if (sensor->priv->desc->lock_async) { - sensor->priv->desc->lock_async (sensor, + if (priv->desc->lock_async) { + priv->desc->lock_async (sensor, cancellable, callback, user_data); @@ -413,14 +436,15 @@ GAsyncResult *res, GError **error) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); gboolean ret = TRUE; g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (sensor->priv->desc != NULL, FALSE); + g_return_val_if_fail (priv->desc != NULL, FALSE); /* proxy up */ - if (sensor->priv->desc->lock_finish) { - ret = sensor->priv->desc->lock_finish (sensor, + if (priv->desc->lock_finish) { + ret = priv->desc->lock_finish (sensor, res, error); } @@ -438,19 +462,72 @@ void cd_sensor_set_state (CdSensor *sensor, CdSensorState state) { - sensor->priv->state = state; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + + /* invalidate */ + if (priv->set_state_id > 0) { + g_source_remove (priv->set_state_id); + priv->set_state_id = 0; + } + + priv->state = state; cd_sensor_dbus_emit_property_changed (sensor, "State", g_variant_new_string (cd_sensor_state_to_string (state))); } +typedef struct { + CdSensor *sensor; + CdSensorState state; +} CdSensorIdleHelper; + +/** + * cd_sensor_set_state_in_idle_cb: + **/ +static gboolean +cd_sensor_set_state_in_idle_cb (gpointer user_data) +{ + CdSensorIdleHelper *helper = (CdSensorIdleHelper *) user_data; + CdSensorPrivate *priv = GET_PRIVATE (helper->sensor); + + /* this is us */ + priv->set_state_id = 0; + + /* set state now */ + cd_sensor_set_state (helper->sensor, helper->state); + g_object_unref (helper->sensor); + g_free (helper); + return G_SOURCE_REMOVE; +} + +/** + * cd_sensor_set_state_in_idle: + * @sensor: a valid #CdSensor instance + * @state: the sensor state, e.g %CD_SENSOR_STATE_IDLE + * + * Sets the device state. + **/ +void +cd_sensor_set_state_in_idle (CdSensor *sensor, CdSensorState state) +{ + CdSensorPrivate *priv = GET_PRIVATE (sensor); + CdSensorIdleHelper *helper = g_new0 (CdSensorIdleHelper, 1); + helper->sensor = g_object_ref (sensor); + helper->state = state; + if (priv->set_state_id > 0) + g_source_remove (priv->set_state_id); + priv->set_state_id = + g_idle_add (cd_sensor_set_state_in_idle_cb, helper); +} + /** * cd_sensor_set_mode: **/ void cd_sensor_set_mode (CdSensor *sensor, CdSensorCap mode) { - sensor->priv->mode = mode; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + priv->mode = mode; cd_sensor_dbus_emit_property_changed (sensor, "Mode", g_variant_new_string (cd_sensor_cap_to_string (mode))); @@ -462,7 +539,8 @@ CdSensorCap cd_sensor_get_mode (CdSensor *sensor) { - return sensor->priv->mode; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + return priv->mode; } /** @@ -478,7 +556,7 @@ gboolean cd_sensor_dump (CdSensor *sensor, GString *data, GError **error) { - CdSensorPrivate *priv = sensor->priv; + CdSensorPrivate *priv = GET_PRIVATE (sensor); /* write common sensor details */ g_string_append (data, "// AUTOMATICALLY GENERATED -- DO NOT EDIT\n"); @@ -489,7 +567,7 @@ g_string_append_printf (data, "serial-number:%s\n", priv->serial); /* no type */ - if (sensor->priv->desc == NULL) { + if (priv->desc == NULL) { g_set_error_literal (error, CD_SENSOR_ERROR, CD_SENSOR_ERROR_INTERNAL, @@ -498,7 +576,7 @@ } /* dump sensor */ - if (sensor->priv->desc->dump_device == NULL) { + if (priv->desc->dump_device == NULL) { g_set_error_literal (error, CD_SENSOR_ERROR, CD_SENSOR_ERROR_INTERNAL, @@ -507,7 +585,7 @@ } /* proxy */ - return sensor->priv->desc->dump_device (sensor, data, error); + return priv->desc->dump_device (sensor, data, error); } /** @@ -519,32 +597,72 @@ gpointer user_data) { GVariant *result = NULL; - CdColorXYZ *sample; + g_autoptr(CdColorXYZ) sample = NULL; CdSensor *sensor = CD_SENSOR (source_object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); GDBusMethodInvocation *invocation = (GDBusMethodInvocation *) user_data; - GError *error = NULL; + g_autoptr(GError) error = NULL; + + /* set here to avoid every sensor doing this */ + cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); /* get the result */ - sample = sensor->priv->desc->get_sample_finish (sensor, res, &error); + sample = priv->desc->get_sample_finish (sensor, res, &error); if (sample == NULL) { g_dbus_method_invocation_return_gerror (invocation, error); - g_error_free (error); - goto out; + return; } /* return value */ - g_debug ("returning value %f, %f, %f", - sample->X, - sample->Y, - sample->Z); - result = g_variant_new ("(ddd)", - sample->X, - sample->Y, - sample->Z); + g_debug ("returning value %f, %f, %f", sample->X, sample->Y, sample->Z); + result = g_variant_new ("(ddd)", sample->X, sample->Y, sample->Z); + g_dbus_method_invocation_return_value (invocation, result); +} + +/** + * cd_sensor_get_spectrum_cb: + **/ +static void +cd_sensor_get_spectrum_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + CdSensor *sensor = CD_SENSOR (source_object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); + GDBusMethodInvocation *invocation = (GDBusMethodInvocation *) user_data; + GVariant *result = NULL; + GVariantBuilder data; + guint i; + g_autoptr(CdSpectrum) sp = NULL; + g_autoptr(GError) error = NULL; + + /* set here to avoid every sensor doing this */ + cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); + + /* get the result */ + sp = priv->desc->get_spectrum_finish (sensor, res, &error); + if (sp == NULL) { + g_dbus_method_invocation_return_gerror (invocation, error); + return; + } + + /* build data array */ + g_variant_builder_init (&data, G_VARIANT_TYPE ("ad")); + for (i = 0; i < cd_spectrum_get_size (sp); i++) { + g_variant_builder_add (&data, "d", + cd_spectrum_get_value (sp, i)); + } + + /* return value */ + g_debug ("returning value %f, %f, [%u]", + cd_spectrum_get_start (sp), + cd_spectrum_get_end (sp), + cd_spectrum_get_size (sp)); + result = g_variant_new ("(ddad)", + cd_spectrum_get_start (sp), + cd_spectrum_get_end (sp), + &data); g_dbus_method_invocation_return_value (invocation, result); -out: - if (sample != NULL) - cd_color_xyz_free (sample); } /** @@ -557,11 +675,12 @@ { gboolean ret; CdSensor *sensor = CD_SENSOR (source_object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); GDBusMethodInvocation *invocation = (GDBusMethodInvocation *) user_data; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* get the result */ - ret = sensor->priv->desc->set_options_finish (sensor, res, &error); + ret = priv->desc->set_options_finish (sensor, res, &error); if (!ret) { g_dbus_method_invocation_return_gerror (invocation, error); return; @@ -578,12 +697,16 @@ gpointer user_data) { CdSensor *sensor = CD_SENSOR (source_object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); GDBusMethodInvocation *invocation = (GDBusMethodInvocation *) user_data; gboolean ret; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; + + /* set here to avoid every sensor doing this */ + cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); /* get the result */ - ret = sensor->priv->desc->lock_finish (sensor, res, &error); + ret = priv->desc->lock_finish (sensor, res, &error); if (!ret) { g_dbus_method_invocation_return_error (invocation, CD_SENSOR_ERROR, @@ -605,14 +728,18 @@ gpointer user_data) { CdSensor *sensor = CD_SENSOR (source_object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); GDBusMethodInvocation *invocation = (GDBusMethodInvocation *) user_data; gboolean ret; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; + + /* set here to avoid every sensor doing this */ + cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); /* get the result */ - if (sensor->priv->desc != NULL && - sensor->priv->desc->unlock_finish != NULL) { - ret = sensor->priv->desc->unlock_finish (sensor, res, &error); + if (priv->desc != NULL && + priv->desc->unlock_finish != NULL) { + ret = priv->desc->unlock_finish (sensor, res, &error); if (!ret) { g_dbus_method_invocation_return_error (invocation, CD_SENSOR_ERROR, @@ -635,13 +762,17 @@ gpointer user_data) { CdSensor *sensor = CD_SENSOR (source_object); + CdSensorPrivate *priv = GET_PRIVATE (sensor); gboolean ret; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; + + /* set here to avoid every sensor doing this */ + cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); /* get the result */ - if (sensor->priv->desc != NULL && - sensor->priv->desc->unlock_finish != NULL) { - ret = sensor->priv->desc->unlock_finish (sensor, res, &error); + if (priv->desc != NULL && + priv->desc->unlock_finish != NULL) { + ret = priv->desc->unlock_finish (sensor, res, &error); if (!ret) { g_warning ("failed to unlock: %s", error->message); @@ -660,22 +791,23 @@ gpointer user_data) { CdSensor *sensor = CD_SENSOR (user_data); + CdSensorPrivate *priv = GET_PRIVATE (sensor); /* dummy */ g_debug ("locked sender has vanished without doing Unlock()!"); - if (sensor->priv->desc == NULL || - sensor->priv->desc->unlock_async == NULL) { + if (priv->desc == NULL || + priv->desc->unlock_async == NULL) { cd_sensor_set_locked (sensor, FALSE); goto out; } /* no longer valid */ - sensor->priv->desc->unlock_async (sensor, - NULL, - cd_sensor_unlock_quietly_cb, - NULL); + priv->desc->unlock_async (sensor, + NULL, + cd_sensor_unlock_quietly_cb, + NULL); out: - sensor->priv->watcher_id = 0; + priv->watcher_id = 0; } /** @@ -689,13 +821,13 @@ { CdSensorCap cap; CdSensor *sensor = CD_SENSOR (user_data); - CdSensorPrivate *priv = sensor->priv; + CdSensorPrivate *priv = GET_PRIVATE (sensor); GVariantIter iter; GVariant *value; const gchar *cap_tmp = NULL; gboolean ret; gchar *key; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* return '' */ if (g_strcmp0 (method_name, "Lock") == 0) { @@ -734,18 +866,18 @@ NULL); /* no support */ - if (sensor->priv->desc == NULL || - sensor->priv->desc->lock_async == NULL) { + if (priv->desc == NULL || + priv->desc->lock_async == NULL) { cd_sensor_set_locked (sensor, TRUE); g_dbus_method_invocation_return_value (invocation, NULL); return; } /* proxy */ - sensor->priv->desc->lock_async (sensor, - NULL, - cd_sensor_lock_cb, - invocation); + priv->desc->lock_async (sensor, + NULL, + cd_sensor_lock_cb, + invocation); return; } @@ -782,18 +914,18 @@ } /* no support */ - if (sensor->priv->desc == NULL || - sensor->priv->desc->unlock_async == NULL) { + if (priv->desc == NULL || + priv->desc->unlock_async == NULL) { cd_sensor_set_locked (sensor, FALSE); g_dbus_method_invocation_return_value (invocation, NULL); return; } /* proxy */ - sensor->priv->desc->unlock_async (sensor, - NULL, - cd_sensor_unlock_cb, - invocation); + priv->desc->unlock_async (sensor, + NULL, + cd_sensor_unlock_cb, + invocation); return; } @@ -822,8 +954,72 @@ } /* no support */ - if (sensor->priv->desc == NULL || - sensor->priv->desc->get_sample_async == NULL) { + if (priv->desc == NULL || + priv->desc->get_sample_async == NULL) { + g_dbus_method_invocation_return_error (invocation, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT, + "no sensor->get_sample"); + return; + } + + /* get the type */ + g_variant_get (parameters, "(&s)", &cap_tmp); + cap = cd_sensor_cap_from_string (cap_tmp); + if (cap == CD_SENSOR_CAP_UNKNOWN) { + g_dbus_method_invocation_return_error (invocation, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "cap '%s' unknown", + cap_tmp); + return; + } + + /* check type */ + if (cap == CD_SENSOR_CAP_SPECTRAL) { + g_dbus_method_invocation_return_error (invocation, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "cannot return spectral"); + return; + } + + /* proxy */ + priv->desc->get_sample_async (sensor, + cap, + NULL, + cd_sensor_get_sample_cb, + invocation); + return; + } + + /* return 'ddad' */ + if (g_strcmp0 (method_name, "GetSpectrum") == 0) { + + g_debug ("CdSensor %s:GetSpectrum()", sender); + + /* check locked */ + if (!priv->locked) { + g_dbus_method_invocation_return_error (invocation, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NOT_LOCKED, + "sensor is not yet locked"); + return; + } + + /* check idle */ + if (priv->state != CD_SENSOR_STATE_IDLE) { + g_dbus_method_invocation_return_error (invocation, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_IN_USE, + "sensor not idle: %s", + cd_sensor_state_to_string (priv->state)); + return; + } + + /* no support */ + if (priv->desc == NULL || + priv->desc->get_spectrum_async == NULL) { g_dbus_method_invocation_return_error (invocation, CD_SENSOR_ERROR, CD_SENSOR_ERROR_NO_SUPPORT, @@ -843,20 +1039,32 @@ return; } + /* check type */ + if (cap != CD_SENSOR_CAP_SPECTRAL && + cap != CD_SENSOR_CAP_CALIBRATION_DARK && + cap != CD_SENSOR_CAP_CALIBRATION_IRRADIANCE) { + g_dbus_method_invocation_return_error (invocation, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "invalid cap, only spectral " + "or calibration type supported"); + return; + } + /* proxy */ - sensor->priv->desc->get_sample_async (sensor, - cap, - NULL, - cd_sensor_get_sample_cb, - invocation); + priv->desc->get_spectrum_async (sensor, + cap, + NULL, + cd_sensor_get_spectrum_cb, + invocation); return; } /* return '' */ if (g_strcmp0 (method_name, "SetOptions") == 0) { - _cleanup_hashtable_unref_ GHashTable *options = NULL; - _cleanup_variant_unref_ GVariant *result = NULL; + g_autoptr(GHashTable) options = NULL; + g_autoptr(GVariant) result = NULL; g_debug ("CdSensor %s:SetOptions()", sender); @@ -880,8 +1088,8 @@ } /* no support */ - if (sensor->priv->desc == NULL || - sensor->priv->desc->set_options_async == NULL) { + if (priv->desc == NULL || + priv->desc->set_options_async == NULL) { g_dbus_method_invocation_return_error (invocation, CD_SENSOR_ERROR, CD_SENSOR_ERROR_NO_SUPPORT, @@ -898,7 +1106,7 @@ g_hash_table_insert (options, key, value); /* proxy */ - sensor->priv->desc->set_options_async (sensor, + priv->desc->set_options_async (sensor, options, NULL, cd_sensor_set_options_cb, @@ -916,22 +1124,23 @@ static GVariant * cd_sensor_get_options_as_variant (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); GList *l; GVariantBuilder builder; - _cleanup_list_free_ GList *list = NULL; + g_autoptr(GList) list = NULL; /* do not try to build an empty array */ - if (g_hash_table_size (sensor->priv->options) == 0) + if (g_hash_table_size (priv->options) == 0) return g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0); /* add all the keys in the dictionary to the variant builder */ - list = g_hash_table_get_keys (sensor->priv->options); + list = g_hash_table_get_keys (priv->options); g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); for (l = list; l != NULL; l = l->next) { g_variant_builder_add (&builder, "{sv}", l->data, - g_hash_table_lookup (sensor->priv->options, + g_hash_table_lookup (priv->options, l->data)); } return g_variant_builder_end (&builder); @@ -943,22 +1152,23 @@ static GVariant * cd_sensor_get_metadata_as_variant (CdSensor *sensor) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); GList *l; GVariantBuilder builder; - _cleanup_list_free_ GList *list = NULL; + g_autoptr(GList) list = NULL; /* we always must have at least one bit of metadata */ - if (g_hash_table_size (sensor->priv->metadata) == 0) + if (g_hash_table_size (priv->metadata) == 0) return g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0); /* add all the keys in the dictionary to the variant builder */ - list = g_hash_table_get_keys (sensor->priv->metadata); + list = g_hash_table_get_keys (priv->metadata); g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); for (l = list; l != NULL; l = l->next) { g_variant_builder_add (&builder, "{ss}", l->data, - g_hash_table_lookup (sensor->priv->metadata, + g_hash_table_lookup (priv->metadata, l->data)); } return g_variant_builder_end (&builder); @@ -1004,7 +1214,7 @@ gpointer user_data) { CdSensor *sensor = CD_SENSOR (user_data); - CdSensorPrivate *priv = sensor->priv; + CdSensorPrivate *priv = GET_PRIVATE (sensor); if (g_strcmp0 (property_name, CD_SENSOR_PROPERTY_ID) == 0) return g_variant_new_string (priv->id); @@ -1051,7 +1261,8 @@ GDBusInterfaceInfo *info, GError **error) { - _cleanup_error_free_ GError *error_local = NULL; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + g_autoptr(GError) error_local = NULL; static const GDBusInterfaceVTable interface_vtable = { cd_sensor_dbus_method_call, @@ -1059,16 +1270,16 @@ NULL }; - sensor->priv->connection = connection; - sensor->priv->registration_id = g_dbus_connection_register_object ( + priv->connection = connection; + priv->registration_id = g_dbus_connection_register_object ( connection, - sensor->priv->object_path, + priv->object_path, info, &interface_vtable, sensor, /* user_data */ NULL, /* user_data_free_func */ &error_local); /* GError** */ - if (sensor->priv->registration_id == 0) { + if (priv->registration_id == 0) { g_set_error (error, CD_SENSOR_ERROR, CD_SENSOR_ERROR_INTERNAL, @@ -1077,8 +1288,8 @@ return FALSE; } g_debug ("CdSensor: Register interface %i on %s", - sensor->priv->registration_id, - sensor->priv->object_path); + priv->registration_id, + priv->object_path); return TRUE; } @@ -1089,7 +1300,8 @@ cd_sensor_get_device_path (CdSensor *sensor) { #ifdef HAVE_UDEV - return g_udev_device_get_sysfs_path (sensor->priv->device); + CdSensorPrivate *priv = GET_PRIVATE (sensor); + return g_udev_device_get_sysfs_path (priv->device); #else return NULL; #endif @@ -1106,10 +1318,10 @@ GError **error) { #ifdef HAVE_UDEV - CdSensorPrivate *priv = sensor->priv; + CdSensorPrivate *priv = GET_PRIVATE (sensor); guint8 busnum; guint8 devnum; - _cleanup_object_unref_ GUsbDevice *device = NULL; + g_autoptr(GUsbDevice) device = NULL; /* convert from GUdevDevice to GUsbDevice */ busnum = g_udev_device_get_sysfs_attr_as_int (priv->device, "busnum"); @@ -1143,10 +1355,11 @@ void cd_sensor_add_cap (CdSensor *sensor, CdSensorCap cap) { - cd_bitfield_add (sensor->priv->caps, cap); + CdSensorPrivate *priv = GET_PRIVATE (sensor); + cd_bitfield_add (priv->caps, cap); cd_sensor_dbus_emit_property_changed (sensor, "Capabilities", - cd_sensor_get_variant_for_caps (sensor->priv->caps)); + cd_sensor_get_variant_for_caps (priv->caps)); } @@ -1157,7 +1370,8 @@ GUdevDevice * cd_sensor_get_device (CdSensor *sensor) { - return sensor->priv->device; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + return priv->device; } /** @@ -1167,9 +1381,10 @@ cd_sensor_set_model (CdSensor *sensor, const gchar *model) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); if (g_strcmp0 (model, "colormunki") == 0) model = "ColorMunki"; - sensor->priv->model = g_strdup (model); + priv->model = g_strdup (model); } /** @@ -1181,7 +1396,7 @@ GError **error) { CdSensorCap cap; - CdSensorPrivate *priv = sensor->priv; + CdSensorPrivate *priv = GET_PRIVATE (sensor); const gchar *images[] = { "attach", "calibrate", "screen", NULL }; const gchar *images_md[] = { CD_SENSOR_METADATA_IMAGE_ATTACH, CD_SENSOR_METADATA_IMAGE_CALIBRATE, @@ -1287,9 +1502,10 @@ cd_sensor_set_index (CdSensor *sensor, guint idx) { - _cleanup_free_ gchar *id = NULL; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + g_autofree gchar *id = NULL; id = g_strdup_printf ("%s-%02i", - cd_sensor_kind_to_string (sensor->priv->kind), + cd_sensor_kind_to_string (priv->kind), idx); cd_sensor_set_id (sensor, id); } @@ -1302,8 +1518,9 @@ const gchar *key, GVariant *value) { + CdSensorPrivate *priv = GET_PRIVATE (sensor); GVariant *options; - g_hash_table_insert (sensor->priv->options, + g_hash_table_insert (priv->options, g_strdup (key), g_variant_ref_sink (value)); @@ -1345,7 +1562,7 @@ cd_sensor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { CdSensor *sensor = CD_SENSOR (object); - CdSensorPrivate *priv = sensor->priv; + CdSensorPrivate *priv = GET_PRIVATE (sensor); switch (prop_id) { case PROP_OBJECT_PATH: @@ -1364,7 +1581,7 @@ cd_sensor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { CdSensor *sensor = CD_SENSOR (object); - CdSensorPrivate *priv = sensor->priv; + CdSensorPrivate *priv = GET_PRIVATE (sensor); switch (prop_id) { case PROP_OBJECT_PATH: @@ -1492,8 +1709,6 @@ FALSE, G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_LOCKED, pspec); - - g_type_class_add_private (klass, sizeof (CdSensorPrivate)); } /** @@ -1502,20 +1717,20 @@ static void cd_sensor_init (CdSensor *sensor) { - sensor->priv = CD_SENSOR_GET_PRIVATE (sensor); - sensor->priv->state = CD_SENSOR_STATE_IDLE; - sensor->priv->mode = CD_SENSOR_CAP_UNKNOWN; + CdSensorPrivate *priv = GET_PRIVATE (sensor); + priv->state = CD_SENSOR_STATE_IDLE; + priv->mode = CD_SENSOR_CAP_UNKNOWN; #ifdef HAVE_GUSB - sensor->priv->usb_ctx = g_usb_context_new (NULL); + priv->usb_ctx = g_usb_context_new (NULL); #endif - sensor->priv->options = g_hash_table_new_full (g_str_hash, - g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) g_variant_unref); - sensor->priv->metadata = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - g_free); + priv->options = g_hash_table_new_full (g_str_hash, + g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) g_variant_unref); + priv->metadata = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + g_free); } /** @@ -1525,7 +1740,7 @@ cd_sensor_finalize (GObject *object) { CdSensor *sensor = CD_SENSOR (object); - CdSensorPrivate *priv = sensor->priv; + CdSensorPrivate *priv = GET_PRIVATE (sensor); if (priv->registration_id > 0) { g_debug ("CdSensor: Unregister interface %i on %s", @@ -1536,6 +1751,8 @@ } if (priv->watcher_id != 0) g_bus_unwatch_name (priv->watcher_id); + if (priv->set_state_id > 0) + g_source_remove (priv->set_state_id); g_free (priv->model); g_free (priv->vendor); g_free (priv->serial); diff -Nru colord-1.2.12/src/cd-sensor-client.c colord-1.3.2/src/cd-sensor-client.c --- colord-1.2.12/src/cd-sensor-client.c 2015-06-04 07:42:56.000000000 +0000 +++ colord-1.3.2/src/cd-sensor-client.c 2015-10-13 15:42:03.000000000 +0000 @@ -30,17 +30,17 @@ static void cd_sensor_client_finalize (GObject *object); -#define CD_SENSOR_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CD_TYPE_SENSOR_CLIENT, CdSensorClientPrivate)) +#define GET_PRIVATE(o) (cd_sensor_client_get_instance_private (o)) /** * CdSensorClientPrivate: **/ -struct _CdSensorClientPrivate +typedef struct { GUdevClient *gudev_client; GPtrArray *array_sensors; guint idx; -}; +} CdSensorClientPrivate; enum { SIGNAL_SENSOR_ADDED, @@ -50,7 +50,7 @@ static guint signals[SIGNAL_LAST] = { 0 }; -G_DEFINE_TYPE (CdSensorClient, cd_sensor_client, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CdSensorClient, cd_sensor_client, G_TYPE_OBJECT) /** * cd_sensor_client_get_by_id: @@ -59,7 +59,7 @@ cd_sensor_client_get_by_id (CdSensorClient *sensor_client, const gchar *sensor_id) { - CdSensorClientPrivate *priv = sensor_client->priv; + CdSensorClientPrivate *priv = GET_PRIVATE (sensor_client); CdSensor *sensor = NULL; CdSensor *sensor_tmp; guint i; @@ -81,11 +81,12 @@ cd_sensor_client_add (CdSensorClient *sensor_client, GUdevDevice *device) { + CdSensorClientPrivate *priv = GET_PRIVATE (sensor_client); CdSensor *sensor = NULL; const gchar *device_file; const gchar *tmp; gboolean ret = FALSE; - GError *error = NULL; + g_autoptr(GError) error = NULL; /* interesting device? */ tmp = g_udev_device_get_property (device, "COLORD_SENSOR_KIND"); @@ -109,12 +110,11 @@ if (!ret) { g_warning ("CdSensorClient: failed to set CM sensor: %s", error->message); - g_error_free (error); goto out; } /* set the index */ - cd_sensor_set_index (sensor, sensor_client->priv->idx); + cd_sensor_set_index (sensor, priv->idx); /* load the sensor */ ret = cd_sensor_load (sensor, &error); @@ -128,10 +128,10 @@ /* signal the addition */ g_debug ("emit: added"); g_signal_emit (sensor_client, signals[SIGNAL_SENSOR_ADDED], 0, sensor); - sensor_client->priv->idx++; + priv->idx++; /* keep track so we can remove with the same device */ - g_ptr_array_add (sensor_client->priv->array_sensors, g_object_ref (sensor)); + g_ptr_array_add (priv->array_sensors, g_object_ref (sensor)); out: if (sensor != NULL) g_object_unref (sensor); @@ -145,6 +145,7 @@ cd_sensor_client_remove (CdSensorClient *sensor_client, GUdevDevice *device) { + CdSensorClientPrivate *priv = GET_PRIVATE (sensor_client); CdSensor *sensor; const gchar *device_file; const gchar *device_path; @@ -165,12 +166,12 @@ device_path = g_udev_device_get_sysfs_path (device); g_debug ("removing color management device: %s [%s]", device_path, device_file); - for (i = 0; i < sensor_client->priv->array_sensors->len; i++) { - sensor = g_ptr_array_index (sensor_client->priv->array_sensors, i); + for (i = 0; i < priv->array_sensors->len; i++) { + sensor = g_ptr_array_index (priv->array_sensors, i); if (g_strcmp0 (cd_sensor_get_device_path (sensor), device_path) == 0) { g_debug ("emit: removed"); g_signal_emit (sensor_client, signals[SIGNAL_SENSOR_REMOVED], 0, sensor); - g_ptr_array_remove_index_fast (sensor_client->priv->array_sensors, i); + g_ptr_array_remove_index_fast (priv->array_sensors, i); goto out; } } @@ -227,12 +228,13 @@ void cd_sensor_client_coldplug (CdSensorClient *sensor_client) { + CdSensorClientPrivate *priv = GET_PRIVATE (sensor_client); GList *devices; GList *l; GUdevDevice *udev_device; /* get all video4linux devices */ - devices = g_udev_client_query_by_subsystem (sensor_client->priv->gudev_client, + devices = g_udev_client_query_by_subsystem (priv->gudev_client, "usb"); for (l = devices; l != NULL; l = l->next) { udev_device = l->data; @@ -262,8 +264,6 @@ G_STRUCT_OFFSET (CdSensorClientClass, sensor_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CD_TYPE_SENSOR); - - g_type_class_add_private (klass, sizeof (CdSensorClientPrivate)); } /** @@ -272,11 +272,11 @@ static void cd_sensor_client_init (CdSensorClient *sensor_client) { + CdSensorClientPrivate *priv = GET_PRIVATE (sensor_client); const gchar *subsystems[] = {"usb", "video4linux", NULL}; - sensor_client->priv = CD_SENSOR_CLIENT_GET_PRIVATE (sensor_client); - sensor_client->priv->array_sensors = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - sensor_client->priv->gudev_client = g_udev_client_new (subsystems); - g_signal_connect (sensor_client->priv->gudev_client, "uevent", + priv->array_sensors = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); + priv->gudev_client = g_udev_client_new (subsystems); + g_signal_connect (priv->gudev_client, "uevent", G_CALLBACK (cd_sensor_client_uevent_cb), sensor_client); } @@ -287,10 +287,10 @@ cd_sensor_client_finalize (GObject *object) { CdSensorClient *sensor_client = CD_SENSOR_CLIENT (object); - CdSensorClientPrivate *priv = sensor_client->priv; + CdSensorClientPrivate *priv = GET_PRIVATE (sensor_client); g_object_unref (priv->gudev_client); - g_ptr_array_unref (sensor_client->priv->array_sensors); + g_ptr_array_unref (priv->array_sensors); G_OBJECT_CLASS (cd_sensor_client_parent_class)->finalize (object); } diff -Nru colord-1.2.12/src/cd-sensor-client.h colord-1.3.2/src/cd-sensor-client.h --- colord-1.2.12/src/cd-sensor-client.h 2015-04-22 09:56:47.000000000 +0000 +++ colord-1.3.2/src/cd-sensor-client.h 2015-10-13 17:38:57.000000000 +0000 @@ -30,21 +30,7 @@ G_BEGIN_DECLS #define CD_TYPE_SENSOR_CLIENT (cd_sensor_client_get_type ()) -#define CD_SENSOR_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_SENSOR_CLIENT, CdSensorClient)) -#define CD_SENSOR_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_SENSOR_CLIENT, CdSensorClientClass)) -#define CD_IS_SENSOR_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_SENSOR_CLIENT)) -#define CD_IS_SENSOR_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_SENSOR_CLIENT)) -#define CD_SENSOR_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_SENSOR_CLIENT, CdSensorClientClass)) - -typedef struct _CdSensorClientPrivate CdSensorClientPrivate; -typedef struct _CdSensorClient CdSensorClient; -typedef struct _CdSensorClientClass CdSensorClientClass; - -struct _CdSensorClient -{ - GObject parent; - CdSensorClientPrivate *priv; -}; +G_DECLARE_DERIVABLE_TYPE (CdSensorClient, cd_sensor_client, CD, SENSOR_CLIENT, GObject) struct _CdSensorClientClass { diff -Nru colord-1.2.12/src/cd-sensor.h colord-1.3.2/src/cd-sensor.h --- colord-1.2.12/src/cd-sensor.h 2015-05-01 13:55:26.000000000 +0000 +++ colord-1.3.2/src/cd-sensor.h 2015-10-16 11:04:50.000000000 +0000 @@ -40,23 +40,10 @@ G_BEGIN_DECLS -#define CD_TYPE_SENSOR (cd_sensor_get_type ()) -#define CD_SENSOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_SENSOR, CdSensor)) -#define CD_SENSOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_SENSOR, CdSensorClass)) -#define CD_IS_SENSOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_SENSOR)) -#define CD_IS_SENSOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_SENSOR)) -#define CD_SENSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_SENSOR, CdSensorClass)) #define CD_SENSOR_ERROR cd_sensor_error_quark() -typedef struct _CdSensorPrivate CdSensorPrivate; -typedef struct _CdSensor CdSensor; -typedef struct _CdSensorClass CdSensorClass; - -struct _CdSensor -{ - GObject parent; - CdSensorPrivate *priv; -}; +#define CD_TYPE_SENSOR (cd_sensor_get_type ()) +G_DECLARE_DERIVABLE_TYPE (CdSensor, cd_sensor, CD, SENSOR, GObject) struct _CdSensorClass { @@ -72,7 +59,6 @@ /* when the data is unavailable */ #define CD_SENSOR_NO_VALUE -1.0f -GType cd_sensor_get_type (void); CdSensor *cd_sensor_new (void); GQuark cd_sensor_error_quark (void); @@ -109,6 +95,8 @@ GError **error); void cd_sensor_set_state (CdSensor *sensor, CdSensorState state); +void cd_sensor_set_state_in_idle (CdSensor *sensor, + CdSensorState state); void cd_sensor_set_mode (CdSensor *sensor, CdSensorCap mode); CdSensorCap cd_sensor_get_mode (CdSensor *sensor); @@ -129,6 +117,14 @@ CdColorXYZ *cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error); +void cd_sensor_get_spectrum_async (CdSensor *sensor, + CdSensorCap cap, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +CdSpectrum *cd_sensor_get_spectrum_finish (CdSensor *sensor, + GAsyncResult *res, + GError **error); gboolean cd_sensor_coldplug (CdSensor *sensor, GError **error); gboolean cd_sensor_dump_device (CdSensor *sensor, diff -Nru colord-1.2.12/src/Makefile.in colord-1.3.2/src/Makefile.in --- colord-1.2.12/src/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/src/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -594,6 +594,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -698,6 +699,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/src/org.freedesktop.ColorManager.Sensor.xml colord-1.3.2/src/org.freedesktop.ColorManager.Sensor.xml --- colord-1.2.12/src/org.freedesktop.ColorManager.Sensor.xml 2015-04-22 09:56:47.000000000 +0000 +++ colord-1.3.2/src/org.freedesktop.ColorManager.Sensor.xml 2015-10-16 11:04:50.000000000 +0000 @@ -256,6 +256,55 @@ + + + + + Gets a color spectrum using the sensor. + + + + + + + + The capability we are using, e.g. crt, + ambient, lcd, + led or projector. + + + + + + + + + The start of the wavelength range in nm. + + + + + + + + + The end of the wavelength range in nm. + + + + + + + + + The non-normalised data array. + + + + + + + diff -Nru colord-1.2.12/src/plugins/cd-plugin-camera.c colord-1.3.2/src/plugins/cd-plugin-camera.c --- colord-1.2.12/src/plugins/cd-plugin-camera.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/plugins/cd-plugin-camera.c 2015-10-13 15:24:13.000000000 +0000 @@ -24,8 +24,6 @@ #include #include -#include "cd-cleanup.h" - #include struct CdPluginPrivate { @@ -79,7 +77,7 @@ const gchar *removable; gboolean embedded = FALSE; guint i; - _cleanup_ptrarray_unref_ GPtrArray *array = NULL; + g_autoptr(GPtrArray) array = NULL; /* get a chain of all the parent devices */ array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); @@ -110,10 +108,10 @@ cd_plugin_add (CdPlugin *plugin, GUdevDevice *udev_device) { const gchar *seat; - _cleanup_free_ gchar *id = NULL; - _cleanup_free_ gchar *model = NULL; - _cleanup_free_ gchar *vendor = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; + g_autofree gchar *id = NULL; + g_autofree gchar *model = NULL; + g_autofree gchar *vendor = NULL; + g_autoptr(CdDevice) device = NULL; /* is a proper camera and not a webcam */ if (!g_udev_device_has_property (udev_device, "ID_GPHOTO2")) diff -Nru colord-1.2.12/src/plugins/cd-plugin-sane.c colord-1.3.2/src/plugins/cd-plugin-sane.c --- colord-1.2.12/src/plugins/cd-plugin-sane.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/plugins/cd-plugin-sane.c 2015-10-13 15:24:13.000000000 +0000 @@ -24,8 +24,6 @@ #include #include -#include "cd-cleanup.h" - struct CdPluginPrivate { GUdevClient *udev_client; gboolean scan_in_progress; @@ -75,7 +73,7 @@ { const gchar *argv[] = {COLORD_SANE_BINARY, NULL}; GPid colord_sane_pid; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; if (priv->scan_in_progress) return; diff -Nru colord-1.2.12/src/plugins/cd-plugin-scanner.c colord-1.3.2/src/plugins/cd-plugin-scanner.c --- colord-1.2.12/src/plugins/cd-plugin-scanner.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/plugins/cd-plugin-scanner.c 2015-10-13 15:24:13.000000000 +0000 @@ -25,8 +25,6 @@ #include #include -#include "cd-cleanup.h" - struct CdPluginPrivate { GUdevClient *udev_client; GHashTable *devices; @@ -89,10 +87,10 @@ { const gchar *devclass; const gchar *seat; - _cleanup_free_ gchar *id = NULL; - _cleanup_free_ gchar *model = NULL; - _cleanup_free_ gchar *vendor = NULL; - _cleanup_object_unref_ CdDevice *device = NULL; + g_autofree gchar *id = NULL; + g_autofree gchar *model = NULL; + g_autofree gchar *vendor = NULL; + g_autoptr(CdDevice) device = NULL; /* is a scanner? */ if (!g_udev_device_has_property (udev_device, "libsane_matched")) diff -Nru colord-1.2.12/src/plugins/Makefile.in colord-1.3.2/src/plugins/Makefile.in --- colord-1.2.12/src/plugins/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/src/plugins/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -370,6 +370,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -474,6 +475,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff -Nru colord-1.2.12/src/sensors/cd-parse-beagle.c colord-1.3.2/src/sensors/cd-parse-beagle.c --- colord-1.2.12/src/sensors/cd-parse-beagle.c 2015-04-22 09:56:46.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-parse-beagle.c 2015-10-14 17:09:55.000000000 +0000 @@ -65,7 +65,7 @@ static void cd_parse_beagle_process_entry_huey (CdParseEntry *entry) { - gchar **tok; + g_auto(GStrv) tok = NULL; guint j; guint8 cmd; guint8 instruction = 0; @@ -120,7 +120,6 @@ out: if (output != NULL) entry->summary_pretty = g_string_free (output, FALSE); - g_strfreev (tok); } /** @@ -129,7 +128,7 @@ static void cd_parse_beagle_process_entry_colormunki (CdParseEntry *entry) { - gchar **tok; + g_auto(GStrv) tok = NULL; guint j; guint8 cmd; guint tok_len; @@ -194,7 +193,6 @@ out: if (output != NULL) entry->summary_pretty = g_string_free (output, FALSE); - g_strfreev (tok); } /** @@ -271,16 +269,16 @@ main (gint argc, gchar *argv[]) { gboolean ret; - gchar *data = NULL; - gchar **split = NULL; gchar **sections = NULL; - GString *output = NULL; - GError *error = NULL; guint i; CdParseEntry entry; gchar *part; gint retval = 1; CdSensorKind kind; + g_autofree gchar *data = NULL; + g_auto(GStrv) split = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GString) output = NULL; if (argc != 4) { g_print ("need to specify [huey|colormunki] input output\n"); @@ -298,7 +296,6 @@ ret = g_file_get_contents (argv[2], &data, NULL, &error); if (!ret) { g_print ("failed to read: %s\n", error->message); - g_error_free (error); goto out; } @@ -338,17 +335,12 @@ ret = g_file_set_contents (argv[3], output->str, -1, &error); if (!ret) { g_print ("failed to read: %s\n", error->message); - g_error_free (error); goto out; } g_print ("done!\n"); retval = 0; out: - if (output != NULL) - g_string_free (output, TRUE); - g_free (data); - g_strfreev (split); return retval; } diff -Nru colord-1.2.12/src/sensors/cd-sensor-argyll.c colord-1.3.2/src/sensors/cd-sensor-argyll.c --- colord-1.2.12/src/sensors/cd-sensor-argyll.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-argyll.c 2016-03-03 09:40:24.000000000 +0000 @@ -28,7 +28,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-sensor.h" #include "cd-spawn.h" @@ -53,78 +52,62 @@ return g_object_get_data (G_OBJECT (sensor), "priv"); } -/* async state for the sensor readings */ +/* async task for the sensor readings */ typedef struct { gboolean ret; CdColorXYZ *sample; - GSimpleAsyncResult *res; CdSensor *sensor; guint exit_id; guint stdout_id; guint timeout_id; -} CdSensorAsyncState; +} CdSensorTaskData; static void -cd_sensor_get_sample_state_finish (CdSensorAsyncState *state, - const GError *error) +cd_sensor_task_data_free (CdSensorTaskData *data) { - CdSensorArgyllPrivate *priv = cd_sensor_argyll_get_private (state->sensor); - - if (state->ret) { - g_simple_async_result_set_op_res_gpointer (state->res, - state->sample, - (GDestroyNotify) cd_color_xyz_free); - } else { - g_simple_async_result_set_from_error (state->res, error); - } - - /* set state */ - cd_sensor_set_state (state->sensor, CD_SENSOR_STATE_IDLE); - - /* complete */ - g_simple_async_result_complete_in_idle (state->res); + CdSensorArgyllPrivate *priv = cd_sensor_argyll_get_private (data->sensor); /* disconnect handlers */ - g_signal_handler_disconnect (priv->spawn, state->exit_id); - g_signal_handler_disconnect (priv->spawn, state->stdout_id); - g_source_remove (state->timeout_id); - - g_object_unref (state->res); - g_object_unref (state->sensor); - g_slice_free (CdSensorAsyncState, state); + if (data->exit_id > 0) + g_signal_handler_disconnect (priv->spawn, data->exit_id); + if (data->stdout_id > 0) + g_signal_handler_disconnect (priv->spawn, data->stdout_id); + if (data->timeout_id > 0) + g_source_remove (data->timeout_id); + g_object_unref (data->sensor); + g_free (data); } static gboolean -cd_sensor_get_sample_timeout_cb (CdSensorAsyncState *state) +cd_sensor_get_sample_timeout_cb (GTask *task) { - GError *error; - error = g_error_new (CD_SENSOR_ERROR, - CD_SENSOR_ERROR_INTERNAL, - "spotread timed out"); - cd_sensor_get_sample_state_finish (state, error); - g_error_free (error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "spotread timed out"); + g_object_unref (task); return G_SOURCE_REMOVE; } static void cd_sensor_get_sample_exit_cb (CdSpawn *spawn, CdSpawnExitType exit_type, - CdSensorAsyncState *state) + GTask *task) { - GError *error; - error = g_error_new (CD_SENSOR_ERROR, - CD_SENSOR_ERROR_INTERNAL, - "spotread exited unexpectedly"); - cd_sensor_get_sample_state_finish (state, error); - g_error_free (error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "spotread exited unexpectedly"); + g_object_unref (task); } static void -cd_sensor_get_sample_stdout_cb (CdSpawn *spawn, const gchar *line, CdSensorAsyncState *state) +cd_sensor_get_sample_stdout_cb (CdSpawn *spawn, const gchar *line, GTask *task) { - CdSensorArgyllPrivate *priv = cd_sensor_argyll_get_private (state->sensor); - _cleanup_error_free_ GError *error = NULL; - _cleanup_strv_free_ gchar **parts = NULL; + CdSensorTaskData *data = g_task_get_task_data (task); + CdSensorArgyllPrivate *priv = cd_sensor_argyll_get_private (data->sensor); + g_autoptr(GError) error = NULL; + g_auto(GStrv) parts = NULL; g_debug ("line='%s'", line); @@ -143,31 +126,34 @@ /* got measurement */ if (g_str_has_prefix (line, " Result is XYZ:")) { + CdColorXYZ *sample; parts = g_strsplit_set (line, " ,", -1); - state->ret = TRUE; - state->sample = cd_color_xyz_new (); - state->sample->X = atof (parts[4]); - state->sample->Y = atof (parts[5]); - state->sample->Z = atof (parts[6]); - cd_sensor_get_sample_state_finish (state, NULL); + sample = cd_color_xyz_new (); + sample->X = atof (parts[4]); + sample->Y = atof (parts[5]); + sample->Z = atof (parts[6]); + g_task_return_pointer (task, sample, (GDestroyNotify) cd_color_xyz_free); + g_object_unref (task); return; } /* failed */ if (g_str_has_prefix (line, "Instrument initialisation failed")) { - error = g_error_new (CD_SENSOR_ERROR, - CD_SENSOR_ERROR_INTERNAL, - "failed to contact hardware (replug)"); - cd_sensor_get_sample_state_finish (state, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "failed to contact hardware (replug)"); + g_object_unref (task); return; } /* need surface */ if (g_strcmp0 (line, "(Sensor should be in surface position)") == 0) { - error = g_error_new (CD_SENSOR_ERROR, - CD_SENSOR_ERROR_REQUIRED_POSITION_SURFACE, - "Move to surface position"); - cd_sensor_get_sample_state_finish (state, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_REQUIRED_POSITION_SURFACE, + "Move to surface position"); + g_object_unref (task); return; } @@ -181,10 +167,11 @@ priv->pos_required = CD_SENSOR_ARGYLL_POS_CALIBRATE; return; } - error = g_error_new (CD_SENSOR_ERROR, - CD_SENSOR_ERROR_REQUIRED_POSITION_CALIBRATE, - "Move to calibration position"); - cd_sensor_get_sample_state_finish (state, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_REQUIRED_POSITION_CALIBRATE, + "Move to calibration position"); + g_object_unref (task); return; } } @@ -235,34 +222,34 @@ gpointer user_data) { CdSensorArgyllPrivate *priv = cd_sensor_argyll_get_private (sensor); - CdSensorAsyncState *state; + CdSensorTaskData *data; + GTask *task = NULL; const gchar *envp[] = { "ARGYLL_NOT_INTERACTIVE=1", NULL }; gboolean ret; - _cleanup_error_free_ GError *error = NULL; - _cleanup_ptrarray_unref_ GPtrArray *argv = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GPtrArray) argv = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - /* save state */ - state = g_slice_new0 (CdSensorAsyncState); - state->res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_get_sample_async); - state->sensor = g_object_ref (sensor); + task = g_task_new (sensor, cancellable, callback, user_data); + + /* set state */ + data = g_new0 (CdSensorTaskData, 1); + data->sensor = g_object_ref (sensor); + g_task_set_task_data (task, data, (GDestroyNotify) cd_sensor_task_data_free); /* set state */ cd_sensor_set_state (sensor, CD_SENSOR_STATE_MEASURING); /* connect before spotread produces values */ - state->exit_id = g_signal_connect (priv->spawn, - "exit", - G_CALLBACK (cd_sensor_get_sample_exit_cb), - state); - state->stdout_id = g_signal_connect (priv->spawn, - "stdout", - G_CALLBACK (cd_sensor_get_sample_stdout_cb), - state); + data->exit_id = g_signal_connect (priv->spawn, + "exit", + G_CALLBACK (cd_sensor_get_sample_exit_cb), + task); + data->stdout_id = g_signal_connect (priv->spawn, + "stdout", + G_CALLBACK (cd_sensor_get_sample_stdout_cb), + task); /* if spotread is not already running then execute */ if (!cd_spawn_is_running (priv->spawn)) { @@ -278,7 +265,10 @@ (gchar **) envp, &error); if (!ret) { - cd_sensor_get_sample_state_finish (state, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } } else { @@ -286,29 +276,16 @@ } /* cover the case where spotread crashes */ - state->timeout_id = g_timeout_add (CD_SENSOR_ARGYLL_MAX_SAMPLE_TIME, - (GSourceFunc) cd_sensor_get_sample_timeout_cb, - state); + data->timeout_id = g_timeout_add (CD_SENSOR_ARGYLL_MAX_SAMPLE_TIME, + (GSourceFunc) cd_sensor_get_sample_timeout_cb, + task); } CdColorXYZ * -cd_sensor_get_sample_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - /* failed */ - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - /* grab detail */ - return cd_color_xyz_dup (g_simple_async_result_get_op_res_gpointer (simple)); +cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -384,8 +361,8 @@ gboolean ret; guint i; guint listno = 0; - _cleanup_free_ gchar *stdout = NULL; - _cleanup_strv_free_ gchar **lines = NULL; + g_autofree gchar *stdout = NULL; + g_auto(GStrv) lines = NULL; /* spawn the --help output to parse the comm-port */ ret = g_spawn_sync (NULL, @@ -437,53 +414,22 @@ } static void -cd_sensor_unlock_state_finish (CdSensorAsyncState *state, - const GError *error) -{ - CdSensorArgyllPrivate *priv = cd_sensor_argyll_get_private (state->sensor); - - if (state->ret) { - g_simple_async_result_set_op_res_gboolean (state->res, - state->ret); - } else { - g_simple_async_result_set_from_error (state->res, error); - } - - /* set state */ - cd_sensor_set_state (state->sensor, CD_SENSOR_STATE_IDLE); - - /* complete */ - g_simple_async_result_complete_in_idle (state->res); - - /* disconnect handlers */ - if (state->exit_id != 0) - g_signal_handler_disconnect (priv->spawn, state->exit_id); - if (state->timeout_id != 0) - g_source_remove (state->timeout_id); - - /* this is no longer valid (put in ::Lock() also?) */ - priv->pos_required = CD_SENSOR_ARGYLL_POS_UNKNOWN; - - g_object_unref (state->res); - g_object_unref (state->sensor); - g_slice_free (CdSensorAsyncState, state); -} - -static void cd_sensor_unlock_exit_cb (CdSpawn *spawn, CdSpawnExitType exit_type, - CdSensorAsyncState *state) + GTask *task) { - if (exit_type == CD_SPAWN_EXIT_TYPE_SIGQUIT) { - state->ret = TRUE; - cd_sensor_unlock_state_finish (state, NULL); - } else { - _cleanup_error_free_ GError *error = NULL; - error = g_error_new (CD_SENSOR_ERROR, - CD_SENSOR_ERROR_INTERNAL, - "exited without sigquit"); - cd_sensor_unlock_state_finish (state, error); + if (exit_type != CD_SPAWN_EXIT_TYPE_SIGQUIT) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "exited without sigquit"); + g_object_unref (task); + return; } + + /* success */ + g_task_return_boolean (task, TRUE); + g_object_unref (task); } void @@ -493,31 +439,30 @@ gpointer user_data) { CdSensorArgyllPrivate *priv = cd_sensor_argyll_get_private (sensor); - CdSensorAsyncState *state; + CdSensorTaskData *data; + GTask *task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - /* save state */ - state = g_slice_new0 (CdSensorAsyncState); - state->res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_unlock_async); - state->sensor = g_object_ref (sensor); + task = g_task_new (sensor, cancellable, callback, user_data); + + /* set state */ + data = g_new0 (CdSensorTaskData, 1); + data->sensor = g_object_ref (sensor); + g_task_set_task_data (task, data, (GDestroyNotify) cd_sensor_task_data_free); /* wait for exit */ - state->exit_id = g_signal_connect (priv->spawn, - "exit", - G_CALLBACK (cd_sensor_unlock_exit_cb), - state); + data->exit_id = g_signal_connect (priv->spawn, + "exit", + G_CALLBACK (cd_sensor_unlock_exit_cb), + task); /* kill spotread */ if (!cd_spawn_kill (priv->spawn)) { - _cleanup_error_free_ GError *error = NULL; - g_set_error (&error, - CD_SENSOR_ERROR, - CD_SENSOR_ERROR_INTERNAL, - "failed to kill spotread"); - cd_sensor_unlock_state_finish (state, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "failed to kill spotread"); + g_object_unref (task); return; } } diff -Nru colord-1.2.12/src/sensors/cd-sensor-colorhug.c colord-1.3.2/src/sensors/cd-sensor-colorhug.c --- colord-1.2.12/src/sensors/cd-sensor-colorhug.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-colorhug.c 2016-03-03 09:40:23.000000000 +0000 @@ -31,7 +31,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-sensor.h" typedef struct @@ -40,19 +39,13 @@ ChDeviceQueue *device_queue; } CdSensorColorhugPrivate; -/* async state for the sensor readings */ +/* async task for the sensor readings */ typedef struct { - CdColorXYZ *sample; CdSensor *sensor; CdColorXYZ xyz; - gboolean ret; - GCancellable *cancellable; - GSimpleAsyncResult *res; guint32 serial_number; - gulong cancellable_id; - GHashTable *options; ChSha1 sha1; -} CdSensorAsyncState; +} CdSensorTaskData; static CdSensorColorhugPrivate * cd_sensor_colorhug_get_private (CdSensor *sensor) @@ -61,59 +54,39 @@ } static void -cd_sensor_colorhug_get_sample_state_finish (CdSensorAsyncState *state, - const GError *error) +cd_sensor_task_data_free (CdSensorTaskData *data) { - /* set result to temp memory location */ - if (state->ret) { - g_simple_async_result_set_op_res_gpointer (state->res, - state->sample, - (GDestroyNotify) cd_color_xyz_free); - } else { - g_simple_async_result_set_from_error (state->res, error); - } - - /* deallocate */ - if (state->cancellable != NULL) { - g_cancellable_disconnect (state->cancellable, state->cancellable_id); - g_object_unref (state->cancellable); - } - - /* set state */ - cd_sensor_set_state (state->sensor, CD_SENSOR_STATE_IDLE); - - /* complete */ - g_simple_async_result_complete_in_idle (state->res); - - g_object_unref (state->res); - g_object_unref (state->sensor); - g_slice_free (CdSensorAsyncState, state); + if (data == NULL) + return; + g_object_unref (data->sensor); + g_free (data); } - static void cd_sensor_colorhug_get_sample_cb (GObject *object, GAsyncResult *res, gpointer user_data) { - gboolean ret = FALSE; ChDeviceQueue *device_queue = CH_DEVICE_QUEUE (object); - CdSensorAsyncState *state = (CdSensorAsyncState *) user_data; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GTask) task = G_TASK (user_data); + CdSensorTaskData *data = g_task_get_task_data (task); + g_autoptr(GError) error = NULL; /* get data */ - ret = ch_device_queue_process_finish (device_queue, res, &error); - if (!ret) { - cd_sensor_colorhug_get_sample_state_finish (state, error); + if (!ch_device_queue_process_finish (device_queue, res, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } g_debug ("finished values: red=%0.6lf, green=%0.6lf, blue=%0.6lf", - state->xyz.X, state->xyz.Y, state->xyz.Z); + data->xyz.X, data->xyz.Y, data->xyz.Z); /* save result */ - state->ret = TRUE; - state->sample = cd_color_xyz_dup (&state->xyz); - cd_sensor_colorhug_get_sample_state_finish (state, NULL); + g_task_return_pointer (task, + cd_color_xyz_dup (&data->xyz), + (GDestroyNotify) cd_color_xyz_free); } @@ -124,14 +97,16 @@ GAsyncReadyCallback callback, gpointer user_data) { - guint16 calibration_index; - CdSensorAsyncState *state; CdSensorColorhugPrivate *priv = cd_sensor_colorhug_get_private (sensor); - _cleanup_error_free_ GError *error = NULL; + CdSensorTaskData *data; + guint16 calibration_index; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); /* no hardware support */ + task = g_task_new (sensor, cancellable, callback, user_data); switch (cap) { case CD_SENSOR_CAP_CALIBRATION: calibration_index = CH_CALIBRATION_INDEX_FACTORY_ONLY; @@ -150,89 +125,36 @@ calibration_index = CH_CALIBRATION_INDEX_PROJECTOR; break; default: - g_set_error_literal (&error, CD_SENSOR_ERROR, - CD_SENSOR_ERROR_NO_SUPPORT, - "ColorHug cannot measure in this mode"); - g_simple_async_report_gerror_in_idle (G_OBJECT (sensor), - callback, - user_data, - error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT, + "ColorHug cannot measure in this mode"); return; } /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_STARTING); - - /* save state */ - state = g_slice_new0 (CdSensorAsyncState); - if (cancellable != NULL) - state->cancellable = g_object_ref (cancellable); - state->res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_get_sample_async); - state->sensor = g_object_ref (sensor); + data = g_new0 (CdSensorTaskData, 1); + data->sensor = g_object_ref (sensor); + g_task_set_task_data (task, data, (GDestroyNotify) cd_sensor_task_data_free); /* request */ + cd_sensor_set_state (sensor, CD_SENSOR_STATE_STARTING); ch_device_queue_take_readings_xyz (priv->device_queue, priv->device, calibration_index, - &state->xyz); + &data->xyz); ch_device_queue_process_async (priv->device_queue, CH_DEVICE_QUEUE_PROCESS_FLAGS_NONE, - state->cancellable, + g_task_get_cancellable (task), cd_sensor_colorhug_get_sample_cb, - state); + g_object_ref (task)); } CdColorXYZ * -cd_sensor_get_sample_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - /* failed */ - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - /* grab detail */ - return cd_color_xyz_dup (g_simple_async_result_get_op_res_gpointer (simple)); -} - -static void -cd_sensor_colorhug_lock_state_finish (CdSensorAsyncState *state, - const GError *error) +cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error) { - /* set result to temp memory location */ - if (state->ret) { - g_simple_async_result_set_op_res_gboolean (state->res, - TRUE); - } else { - g_simple_async_result_set_from_error (state->res, error); - } - - /* set state */ - cd_sensor_set_state (state->sensor, CD_SENSOR_STATE_IDLE); - - /* deallocate */ - if (state->cancellable != NULL) { - g_cancellable_disconnect (state->cancellable, - state->cancellable_id); - g_object_unref (state->cancellable); - } - - /* complete */ - g_simple_async_result_complete_in_idle (state->res); - - g_object_unref (state->res); - g_object_unref (state->sensor); - g_slice_free (CdSensorAsyncState, state); + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -240,27 +162,22 @@ GAsyncResult *res, gpointer user_data) { - CdSensorAsyncState *state = (CdSensorAsyncState *) user_data; - gboolean ret; - gchar *sha1; + GTask *task = G_TASK (user_data); + CdSensorTaskData *data = g_task_get_task_data (task); + CdSensor *sensor = data->sensor; ChDeviceQueue *device_queue = CH_DEVICE_QUEUE (object); - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* get data, although don't fail if it does not exist */ - ret = ch_device_queue_process_finish (device_queue, res, &error); - if (!ret) { + if (!ch_device_queue_process_finish (device_queue, res, &error)) { g_warning ("ignoring error: %s", error->message); } else { - sha1 = ch_sha1_to_string (&state->sha1); - cd_sensor_add_option (state->sensor, + g_autofree gchar *sha1 = ch_sha1_to_string (&data->sha1); + cd_sensor_add_option (sensor, "remote-profile-hash", g_variant_new_string (sha1)); - g_free (sha1); } - - /* save result */ - state->ret = TRUE; - cd_sensor_colorhug_lock_state_finish (state, NULL); + g_task_return_boolean (task, TRUE); } static void @@ -268,35 +185,40 @@ GAsyncResult *res, gpointer user_data) { - CdSensorAsyncState *state = (CdSensorAsyncState *) user_data; - gboolean ret; + GTask *task = G_TASK (user_data); + CdSensorTaskData *data = g_task_get_task_data (task); + CdSensor *sensor = data->sensor; + CdSensorColorhugPrivate *priv = cd_sensor_colorhug_get_private (sensor); ChDeviceQueue *device_queue = CH_DEVICE_QUEUE (object); - CdSensorColorhugPrivate *priv = cd_sensor_colorhug_get_private (state->sensor); - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *serial_number_tmp = NULL; + gboolean ret; + g_autoptr(GError) error = NULL; + g_autofree gchar *serial_number_tmp = NULL; /* get data */ ret = ch_device_queue_process_finish (device_queue, res, &error); if (!ret) { - cd_sensor_colorhug_lock_state_finish (state, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } /* set this */ serial_number_tmp = g_strdup_printf ("%" G_GUINT32_FORMAT, - state->serial_number); - cd_sensor_set_serial (state->sensor, serial_number_tmp); + data->serial_number); + cd_sensor_set_serial (sensor, serial_number_tmp); g_debug ("Serial number: %s", serial_number_tmp); /* get the optional remote hash */ ch_device_queue_get_remote_hash (priv->device_queue, priv->device, - &state->sha1); + &data->sha1); ch_device_queue_process_async (priv->device_queue, CH_DEVICE_QUEUE_PROCESS_FLAGS_NONE, - state->cancellable, + g_task_get_cancellable (task), cd_sensor_colorhug_get_remote_hash_cb, - state); + task); } /** @@ -317,23 +239,24 @@ GAsyncReadyCallback callback, gpointer user_data) { - CdSensorAsyncState *state; CdSensorColorhugPrivate *priv = cd_sensor_colorhug_get_private (sensor); - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GTask) task = NULL; + CdSensorTaskData *data; g_return_if_fail (CD_IS_SENSOR (sensor)); /* try to find the USB device */ + task = g_task_new (sensor, cancellable, callback, user_data); priv->device = cd_sensor_open_usb_device (sensor, CH_USB_CONFIG, CH_USB_INTERFACE, &error); if (priv->device == NULL) { - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); - g_simple_async_report_gerror_in_idle (G_OBJECT (sensor), - callback, - user_data, - error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } @@ -341,14 +264,9 @@ cd_sensor_set_state (sensor, CD_SENSOR_STATE_STARTING); /* save state */ - state = g_slice_new0 (CdSensorAsyncState); - if (cancellable != NULL) - state->cancellable = g_object_ref (cancellable); - state->res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_lock_async); - state->sensor = g_object_ref (sensor); + data = g_new0 (CdSensorTaskData, 1); + data->sensor = g_object_ref (sensor); + g_task_set_task_data (task, data, (GDestroyNotify) cd_sensor_task_data_free); /* start the color sensor */ ch_device_queue_set_leds (priv->device_queue, @@ -356,7 +274,7 @@ 0x01, 0x03, 0x10, 0x20); ch_device_queue_get_serial_number (priv->device_queue, priv->device, - &state->serial_number); + &data->serial_number); if (cd_sensor_get_kind (sensor) == CD_SENSOR_KIND_COLORHUG) { ch_device_queue_set_integral_time (priv->device_queue, priv->device, @@ -367,50 +285,42 @@ } ch_device_queue_process_async (priv->device_queue, CH_DEVICE_QUEUE_PROCESS_FLAGS_NONE, - state->cancellable, + g_task_get_cancellable (task), cd_sensor_colorhug_startup_cb, - state); + g_object_ref (task)); } gboolean -cd_sensor_lock_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - return TRUE; +cd_sensor_lock_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void -cd_sensor_unlock_thread_cb (GSimpleAsyncResult *res, - GObject *object, +cd_sensor_unlock_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable) { - CdSensor *sensor = CD_SENSOR (object); + CdSensor *sensor = CD_SENSOR (source_object); CdSensorColorhugPrivate *priv = cd_sensor_colorhug_get_private (sensor); - gboolean ret = FALSE; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* close */ if (priv->device != NULL) { - ret = g_usb_device_close (priv->device, &error); - if (!ret) { - g_simple_async_result_set_from_error (res, error); + if (!g_usb_device_close (priv->device, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } - - /* clear */ - g_object_unref (priv->device); - priv->device = NULL; + g_clear_object (&priv->device); } + + /* success */ + g_task_return_boolean (task, TRUE); } void @@ -419,91 +329,43 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - - /* run in a thread */ - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_unlock_async); - g_simple_async_result_run_in_thread (res, - cd_sensor_unlock_thread_cb, - 0, - cancellable); - g_object_unref (res); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_run_in_thread (task, cd_sensor_unlock_thread_cb); } gboolean -cd_sensor_unlock_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - return TRUE; +cd_sensor_unlock_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } /**********************************************************************/ -static void cd_sensor_set_next_option (CdSensorAsyncState *state); - -static void -cd_sensor_colorhug_set_options_state_finish (CdSensorAsyncState *state, - const GError *error) -{ - /* set result to temp memory location */ - if (state->ret) { - g_simple_async_result_set_op_res_gboolean(state->res, TRUE); - } else { - g_simple_async_result_set_from_error (state->res, error); - } - - /* deallocate */ - if (state->cancellable != NULL) { - g_cancellable_disconnect (state->cancellable, state->cancellable_id); - g_object_unref (state->cancellable); - } - - /* set state */ - cd_sensor_set_state (state->sensor, CD_SENSOR_STATE_IDLE); - - /* complete */ - g_simple_async_result_complete_in_idle (state->res); - - g_object_unref (state->res); - g_object_unref (state->sensor); - g_hash_table_unref (state->options); - g_slice_free (CdSensorAsyncState, state); -} +static void cd_sensor_set_next_option (GTask *task); static void cd_sensor_colorhug_set_options_cb (GObject *object, - GAsyncResult *res, - gpointer user_data) + GAsyncResult *res, + gpointer user_data) { - gboolean ret = FALSE; ChDeviceQueue *device_queue = CH_DEVICE_QUEUE (object); - CdSensorAsyncState *state = (CdSensorAsyncState *) user_data; - _cleanup_error_free_ GError *error = NULL; + GTask *task = G_TASK (user_data); + g_autoptr(GError) error = NULL; /* get data */ - ret = ch_device_queue_process_finish (device_queue, res, &error); - if (!ret) { - cd_sensor_colorhug_set_options_state_finish (state, error); + if (!ch_device_queue_process_finish (device_queue, res, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } /* do next option */ - cd_sensor_set_next_option (state); + cd_sensor_set_next_option (task); } static void @@ -513,51 +375,55 @@ { gboolean ret = FALSE; ChDeviceQueue *device_queue = CH_DEVICE_QUEUE (object); - CdSensorAsyncState *state = (CdSensorAsyncState *) user_data; - _cleanup_error_free_ GError *error = NULL; + GTask *task = G_TASK (user_data); + g_autoptr(GError) error = NULL; /* get data */ ret = ch_device_queue_process_finish (device_queue, res, &error); if (!ret) { - cd_sensor_colorhug_set_options_state_finish (state, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } /* all done */ - state->ret = TRUE; - cd_sensor_colorhug_set_options_state_finish (state, NULL); + g_task_return_boolean (task, TRUE); } static void -cd_sensor_set_next_option (CdSensorAsyncState *state) +cd_sensor_set_next_option (GTask *task) { - CdSensorColorhugPrivate *priv = cd_sensor_colorhug_get_private (state->sensor); + CdSensor *sensor = CD_SENSOR (g_task_get_source_object (task)); + CdSensorColorhugPrivate *priv = cd_sensor_colorhug_get_private (sensor); + GHashTable *options = g_task_get_task_data (task); ChSha1 sha1; const gchar *key = NULL; const gchar *magic = "Un1c0rn2"; gboolean ret; GVariant *value; - _cleanup_error_free_ GError *error = NULL; - _cleanup_list_free_ GList *keys = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GList) keys = NULL; /* write eeprom to preserve settings */ - keys = g_hash_table_get_keys (state->options); + keys = g_hash_table_get_keys (options); if (keys == NULL) { ch_device_queue_write_eeprom (priv->device_queue, - priv->device, - magic); + priv->device, + magic); ch_device_queue_process_async (priv->device_queue, CH_DEVICE_QUEUE_PROCESS_FLAGS_NONE, - state->cancellable, + g_task_get_cancellable (task), cd_sensor_colorhug_write_eeprom_cb, - state); + task); return; } /* request */ key = (const gchar *) keys->data; g_debug ("trying to set key %s", key); - value = g_hash_table_lookup (state->options, key); + value = g_hash_table_lookup (options, key); if (g_strcmp0 (key, "remote-profile-hash") == 0) { /* parse the hash */ @@ -565,31 +431,34 @@ &sha1, &error); if (!ret) { - cd_sensor_colorhug_set_options_state_finish (state, error); - g_hash_table_remove (state->options, key); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); + g_hash_table_remove (options, key); return; } /* set the remote hash */ g_debug ("setting remote hash value %s", g_variant_get_string (value, NULL)); - cd_sensor_add_option (state->sensor, key, value); + cd_sensor_add_option (sensor, key, value); ch_device_queue_set_remote_hash (priv->device_queue, priv->device, &sha1); ch_device_queue_process_async (priv->device_queue, CH_DEVICE_QUEUE_PROCESS_FLAGS_NONE, - state->cancellable, + g_task_get_cancellable (task), cd_sensor_colorhug_set_options_cb, - state); + task); } else { - g_set_error (&error, - CD_SENSOR_ERROR, - CD_SENSOR_ERROR_NO_SUPPORT, - "Sensor option %s is not supported", - key); - cd_sensor_colorhug_set_options_state_finish (state, error); - g_hash_table_remove (state->options, key); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT, + "Sensor option %s is not supported", + key); + g_hash_table_remove (options, key); + return; } } @@ -600,44 +469,21 @@ GAsyncReadyCallback callback, gpointer user_data) { - CdSensorAsyncState *state; - + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - - /* set state */ + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_set_task_data (task, + g_hash_table_ref (options), + (GDestroyNotify) g_hash_table_unref); cd_sensor_set_state (sensor, CD_SENSOR_STATE_BUSY); - - /* save state */ - state = g_slice_new0 (CdSensorAsyncState); - if (cancellable != NULL) - state->cancellable = g_object_ref (cancellable); - state->res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_set_options_async); - state->sensor = g_object_ref (sensor); - state->options = g_hash_table_ref (options); - cd_sensor_set_next_option (state); + cd_sensor_set_next_option (task); } gboolean -cd_sensor_set_options_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - /* failed */ - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - /* grab detail */ - return g_simple_async_result_get_op_res_gboolean (simple); +cd_sensor_set_options_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void diff -Nru colord-1.2.12/src/sensors/cd-sensor-colorhug.h colord-1.3.2/src/sensors/cd-sensor-colorhug.h --- colord-1.2.12/src/sensors/cd-sensor-colorhug.h 2015-04-22 09:56:46.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-colorhug.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Copyright (C) 2011 Richard Hughes - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __CD_SENSOR_COLORHUG_H -#define __CD_SENSOR_COLORHUG_H - -#include - -#include "cd-sensor.h" - -G_BEGIN_DECLS - -#define CD_TYPE_SENSOR_COLORHUG (cd_sensor_colorhug_get_type ()) -#define CD_SENSOR_COLORHUG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_SENSOR_COLORHUG, CdSensorColorhug)) -#define CD_SENSOR_COLORHUG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_SENSOR_COLORHUG, CdSensorColorhugClass)) -#define CD_IS_SENSOR_COLORHUG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_SENSOR_COLORHUG)) - -typedef struct _CdSensorColorhugPrivate CdSensorColorhugPrivate; -typedef struct _CdSensorColorhug CdSensorColorhug; -typedef struct _CdSensorColorhugClass CdSensorColorhugClass; - -struct _CdSensorColorhug -{ - CdSensor parent; - CdSensorColorhugPrivate *priv; -}; - -struct _CdSensorColorhugClass -{ - CdSensorClass parent_class; -}; - -GType cd_sensor_colorhug_get_type (void); -CdSensor *cd_sensor_colorhug_new (void); - -G_END_DECLS - -#endif /* __CD_SENSOR_COLORHUG_H */ - diff -Nru colord-1.2.12/src/sensors/cd-sensor-dtp94.c colord-1.3.2/src/sensors/cd-sensor-dtp94.c --- colord-1.2.12/src/sensors/cd-sensor-dtp94.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-dtp94.c 2016-03-03 09:40:27.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2013 Richard Hughes + * Copyright (C) 2013-2015 Richard Hughes * * Licensed under the GNU General Public License Version 2 * @@ -31,8 +31,6 @@ #include "../src/cd-sensor.h" -#include "cd-cleanup.h" - #include typedef struct @@ -40,17 +38,6 @@ GUsbDevice *device; } CdSensorDtp94Private; -/* async state for the sensor readings */ -typedef struct { - gboolean ret; - CdColorXYZ *sample; - gulong cancellable_id; - GCancellable *cancellable; - GSimpleAsyncResult *res; - CdSensor *sensor; - CdSensorCap current_cap; -} CdSensorAsyncState; - #define DTP94_CONTROL_MESSAGE_TIMEOUT 50000 /* ms */ static CdSensorDtp94Private * @@ -60,60 +47,28 @@ } static void -cd_sensor_dtp94_get_sample_state_finish (CdSensorAsyncState *state, - const GError *error) -{ - /* set result to temp memory location */ - if (state->ret) { - g_simple_async_result_set_op_res_gpointer (state->res, - state->sample, - (GDestroyNotify) cd_color_xyz_free); - } else { - g_simple_async_result_set_from_error (state->res, error); - } - - /* deallocate */ - if (state->cancellable != NULL) { - g_cancellable_disconnect (state->cancellable, state->cancellable_id); - g_object_unref (state->cancellable); - } - - g_object_unref (state->res); - g_object_unref (state->sensor); - g_slice_free (CdSensorAsyncState, state); -} - -static void -cd_sensor_dtp94_cancellable_cancel_cb (GCancellable *cancellable, - CdSensorAsyncState *state) -{ - g_warning ("cancelled dtp94"); -} - -static void -cd_sensor_dtp94_sample_thread_cb (GSimpleAsyncResult *res, - GObject *object, - GCancellable *cancellable) +cd_sensor_dtp94_sample_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) { - CdSensor *sensor = CD_SENSOR (object); - CdSensorAsyncState *state = (CdSensorAsyncState *) g_object_get_data (G_OBJECT (cancellable), "state"); + CdSensor *sensor = CD_SENSOR (source_object); + CdSensorCap cap = GPOINTER_TO_UINT (task_data); CdSensorDtp94Private *priv = cd_sensor_dtp94_get_private (sensor); - _cleanup_error_free_ GError *error = NULL; + CdColorXYZ *sample; + g_autoptr(GError) error = NULL; /* take a measurement from the sensor */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_MEASURING); - state->sample = dtp94_device_take_sample (priv->device, - state->current_cap, - &error); - if (state->sample == NULL) { - cd_sensor_dtp94_get_sample_state_finish (state, error); - goto out; + cd_sensor_set_state_in_idle (sensor, CD_SENSOR_STATE_MEASURING); + sample = dtp94_device_take_sample (priv->device, cap, &error); + if (sample == NULL) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "%s", error->message); + return; } - state->ret = TRUE; - cd_sensor_dtp94_get_sample_state_finish (state, NULL); -out: - /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); + g_task_return_pointer (task, sample, NULL); } void @@ -123,64 +78,30 @@ GAsyncReadyCallback callback, gpointer user_data) { - CdSensorAsyncState *state; - GCancellable *tmp; - + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - - /* save state */ - state = g_slice_new0 (CdSensorAsyncState); - state->res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_get_sample_async); - state->sensor = g_object_ref (sensor); - state->current_cap = cap; - if (cancellable != NULL) { - state->cancellable = g_object_ref (cancellable); - state->cancellable_id = g_cancellable_connect (cancellable, G_CALLBACK (cd_sensor_dtp94_cancellable_cancel_cb), state, NULL); - } - - /* run in a thread */ - tmp = g_cancellable_new (); - g_object_set_data (G_OBJECT (tmp), "state", state); - g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res), - cd_sensor_dtp94_sample_thread_cb, - 0, - (GCancellable*) tmp); - g_object_unref (tmp); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_set_task_data (task, GUINT_TO_POINTER (cap), NULL); + g_task_run_in_thread (task, cd_sensor_dtp94_sample_thread_cb); } CdColorXYZ * -cd_sensor_get_sample_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - /* failed */ - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - /* grab detail */ - return cd_color_xyz_dup (g_simple_async_result_get_op_res_gpointer (simple)); +cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void -cd_sensor_dtp94_lock_thread_cb (GSimpleAsyncResult *res, - GObject *object, - GCancellable *cancellable) +cd_sensor_dtp94_lock_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) { - CdSensor *sensor = CD_SENSOR (object); + CdSensor *sensor = CD_SENSOR (source_object); CdSensorDtp94Private *priv = cd_sensor_dtp94_get_private (sensor); - gboolean ret = FALSE; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *serial = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *serial = NULL; /* try to find the USB device */ priv->device = cd_sensor_open_usb_device (sensor, @@ -188,33 +109,38 @@ 0x00, /* interface */ &error); if (priv->device == NULL) { - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); - g_simple_async_result_set_from_error (res, error); - goto out; + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); + return; } /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_STARTING); + cd_sensor_set_state_in_idle (sensor, CD_SENSOR_STATE_STARTING); /* do startup sequence */ - ret = dtp94_device_setup (priv->device, &error); - if (!ret) { - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); - g_simple_async_result_set_from_error (res, error); - goto out; + if (!dtp94_device_setup (priv->device, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); + return; } /* get serial */ serial = dtp94_device_get_serial (priv->device, &error); if (serial == NULL) { - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); - g_simple_async_result_set_from_error (res, error); - goto out; + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "%s", error->message); + return; } cd_sensor_set_serial (sensor, serial); -out: - /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); + + /* success */ + g_task_return_boolean (task, TRUE); } void @@ -223,61 +149,43 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - - /* run in a thread */ - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_lock_async); - g_simple_async_result_run_in_thread (res, - cd_sensor_dtp94_lock_thread_cb, - 0, - cancellable); - g_object_unref (res); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_run_in_thread (task, cd_sensor_dtp94_lock_thread_cb); } gboolean -cd_sensor_lock_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - return TRUE; +cd_sensor_lock_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void -cd_sensor_unlock_thread_cb (GSimpleAsyncResult *res, - GObject *object, +cd_sensor_unlock_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable) { - CdSensor *sensor = CD_SENSOR (object); + CdSensor *sensor = CD_SENSOR (source_object); CdSensorDtp94Private *priv = cd_sensor_dtp94_get_private (sensor); - gboolean ret = FALSE; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* close */ if (priv->device != NULL) { - ret = g_usb_device_close (priv->device, &error); - if (!ret) { - g_simple_async_result_set_from_error (res, error); + if (!g_usb_device_close (priv->device, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } - - /* clear */ - g_object_unref (priv->device); - priv->device = NULL; + g_clear_object (&priv->device); } + + /* success */ + g_task_return_boolean (task, TRUE); } void @@ -286,37 +194,17 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - - /* run in a thread */ - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_unlock_async); - g_simple_async_result_run_in_thread (res, - cd_sensor_unlock_thread_cb, - 0, - cancellable); - g_object_unref (res); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_run_in_thread (task, cd_sensor_unlock_thread_cb); } gboolean -cd_sensor_unlock_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - return TRUE; +cd_sensor_unlock_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } gboolean diff -Nru colord-1.2.12/src/sensors/cd-sensor-dtp94.h colord-1.3.2/src/sensors/cd-sensor-dtp94.h --- colord-1.2.12/src/sensors/cd-sensor-dtp94.h 2015-04-22 09:56:46.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-dtp94.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Copyright (C) 2013 Richard Hughes - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __CD_SENSOR_DTP94_H -#define __CD_SENSOR_DTP94_H - -#include - -#include "cd-sensor.h" - -G_BEGIN_DECLS - -#define CD_TYPE_SENSOR_DTP94 (cd_sensor_dtp94_get_type ()) -#define CD_SENSOR_DTP94(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_SENSOR_DTP94, CdSensorDtp94)) -#define CD_SENSOR_DTP94_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_SENSOR_DTP94, CdSensorDtp94Class)) -#define CD_IS_SENSOR_DTP94(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_SENSOR_DTP94)) - -typedef struct _CdSensorDtp94Private CdSensorDtp94Private; -typedef struct _CdSensorDtp94 CdSensorDtp94; -typedef struct _CdSensorDtp94Class CdSensorDtp94Class; - -struct _CdSensorDtp94 -{ - CdSensor parent; - CdSensorDtp94Private *priv; -}; - -struct _CdSensorDtp94Class -{ - CdSensorClass parent_class; -}; - -GType cd_sensor_dtp94_get_type (void); -CdSensor *cd_sensor_dtp94_new (void); - -G_END_DECLS - -#endif /* __CD_SENSOR_DTP94_H */ - diff -Nru colord-1.2.12/src/sensors/cd-sensor-dummy.c colord-1.3.2/src/sensors/cd-sensor-dummy.c --- colord-1.2.12/src/sensors/cd-sensor-dummy.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-dummy.c 2016-03-03 09:40:33.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2010-2011 Richard Hughes + * Copyright (C) 2010-2015 Richard Hughes * * Licensed under the GNU General Public License Version 2 * @@ -28,7 +28,6 @@ #include #include -#include "cd-cleanup.h" #include "cd-sensor.h" typedef struct @@ -38,85 +37,52 @@ cmsHTRANSFORM transform_fake; } CdSensorDummyPrivate; -/* async state for the sensor readings */ -typedef struct { - gboolean ret; - CdColorXYZ *sample; - GSimpleAsyncResult *res; - CdSensor *sensor; -} CdSensorAsyncState; - static CdSensorDummyPrivate * cd_sensor_dummy_get_private (CdSensor *sensor) { return g_object_get_data (G_OBJECT (sensor), "priv"); } -static void -cd_sensor_get_sample_state_finish (CdSensorAsyncState *state, - const GError *error) -{ - if (state->ret) { - g_simple_async_result_set_op_res_gpointer (state->res, - state->sample, - (GDestroyNotify) cd_color_xyz_free); - } else { - g_simple_async_result_set_from_error (state->res, error); - } - - /* set state */ - cd_sensor_set_state (state->sensor, CD_SENSOR_STATE_IDLE); - - /* complete */ - g_simple_async_result_complete_in_idle (state->res); - - g_object_unref (state->res); - g_object_unref (state->sensor); - g_slice_free (CdSensorAsyncState, state); -} - static gboolean -cd_sensor_get_ambient_wait_cb (CdSensorAsyncState *state) +cd_sensor_get_ambient_wait_cb (GTask *task) { - state->ret = TRUE; - state->sample = cd_color_xyz_new (); - state->sample->X = 7.7f; - state->sample->Y = CD_SENSOR_NO_VALUE; - state->sample->Z = CD_SENSOR_NO_VALUE; + CdColorXYZ *sample = NULL; + + sample = cd_color_xyz_new (); + sample->X = 7.7f; + sample->Y = CD_SENSOR_NO_VALUE; + sample->Z = CD_SENSOR_NO_VALUE; + g_task_return_pointer (task, sample, (GDestroyNotify) cd_color_xyz_free); - /* just return without a problem */ - cd_sensor_get_sample_state_finish (state, NULL); return G_SOURCE_REMOVE; } static gboolean -cd_sensor_get_sample_wait_cb (CdSensorAsyncState *state) +cd_sensor_get_sample_wait_cb (GTask *task) { - CdSensorDummyPrivate *priv = cd_sensor_dummy_get_private (state->sensor); - _cleanup_error_free_ GError *error = NULL; + CdSensor *sensor = CD_SENSOR (g_task_get_source_object (task)); + CdSensorDummyPrivate *priv = cd_sensor_dummy_get_private (sensor); + CdColorXYZ *sample = NULL; + g_autoptr(GError) error = NULL; /* never setup */ if (priv->transform_fake == NULL) { - g_set_error_literal (&error, - CD_SENSOR_ERROR, - CD_SENSOR_ERROR_NO_SUPPORT, - "no fake transfor set up"); - cd_sensor_get_sample_state_finish (state, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT, + "no fake transfor set up"); return G_SOURCE_REMOVE; } /* run the sample through the profile */ - state->ret = TRUE; - state->sample = cd_color_xyz_new (); - cmsDoTransform (priv->transform_fake, - &priv->sample_fake, - state->sample, 1); + sample = cd_color_xyz_new (); + cmsDoTransform (priv->transform_fake, &priv->sample_fake, sample, 1); /* emulate */ - cd_sensor_button_pressed (state->sensor); + cd_sensor_button_pressed (sensor); /* just return without a problem */ - cd_sensor_get_sample_state_finish (state, NULL); + g_task_return_pointer (task, sample, (GDestroyNotify) cd_color_xyz_free); return G_SOURCE_REMOVE; } @@ -127,66 +93,34 @@ GAsyncReadyCallback callback, gpointer user_data) { - CdSensorAsyncState *state; + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - /* save state */ - state = g_slice_new0 (CdSensorAsyncState); - state->res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_get_sample_async); - state->sensor = g_object_ref (sensor); + task = g_task_new (sensor, cancellable, callback, user_data); /* set state */ cd_sensor_set_state (sensor, CD_SENSOR_STATE_MEASURING); /* just complete in idle */ if (cap != CD_SENSOR_CAP_AMBIENT) - g_timeout_add_seconds (2, (GSourceFunc) cd_sensor_get_sample_wait_cb, state); + g_timeout_add_seconds (2, (GSourceFunc) cd_sensor_get_sample_wait_cb, task); else - g_timeout_add_seconds (2, (GSourceFunc) cd_sensor_get_ambient_wait_cb, state); + g_timeout_add_seconds (2, (GSourceFunc) cd_sensor_get_ambient_wait_cb, task); } CdColorXYZ * -cd_sensor_get_sample_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - /* failed */ - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - /* grab detail */ - return cd_color_xyz_dup (g_simple_async_result_get_op_res_gpointer (simple)); +cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } gboolean -cd_sensor_set_options_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - /* failed */ - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - - /* grab detail */ - return g_simple_async_result_get_op_res_gboolean (simple); +cd_sensor_set_options_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } void @@ -197,19 +131,15 @@ gpointer user_data) { CdSensorDummyPrivate *priv = cd_sensor_dummy_get_private (sensor); - GSimpleAsyncResult *res; GList *l; - gboolean ret = TRUE; const gchar *key_name; GVariant *value; - _cleanup_list_free_ GList *keys = NULL; + g_autoptr(GTask) task = NULL; + g_autoptr(GList) keys = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_set_options_async); + task = g_task_new (sensor, cancellable, callback, user_data); /* look for any keys we recognise */ keys = g_hash_table_get_keys (options); @@ -217,13 +147,12 @@ key_name = (const gchar *) l->data; value = g_hash_table_lookup (options, key_name); if (g_strcmp0 (g_variant_get_type_string (value), "d") != 0) { - ret = FALSE; - g_simple_async_result_set_error (res, - CD_SENSOR_ERROR, - CD_SENSOR_ERROR_NO_SUPPORT, - "unexpected type '%s' not supported", - g_variant_get_type_string (value)); - break; + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT, + "unexpected type '%s' not supported", + g_variant_get_type_string (value)); + return; } if (g_strcmp0 (key_name, "sample[red]") == 0) { priv->sample_fake.R = g_variant_get_double (value); @@ -232,22 +161,17 @@ } else if (g_strcmp0 (key_name, "sample[blue]") == 0) { priv->sample_fake.B = g_variant_get_double (value); } else { - ret = FALSE; - g_simple_async_result_set_error (res, - CD_SENSOR_ERROR, - CD_SENSOR_ERROR_NO_SUPPORT, - "option '%s' is not supported", - key_name); - break; + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT, + "option '%s' is not supported", + key_name); + return; } } /* success */ - if (ret) - g_simple_async_result_set_op_res_gboolean (res, TRUE); - - /* complete */ - g_simple_async_result_complete_in_idle (res); + g_task_return_boolean (task, TRUE); } static void diff -Nru colord-1.2.12/src/sensors/cd-sensor-dump.c colord-1.3.2/src/sensors/cd-sensor-dump.c --- colord-1.2.12/src/sensors/cd-sensor-dump.c 2015-05-01 13:55:26.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-dump.c 2015-10-13 15:42:03.000000000 +0000 @@ -33,7 +33,7 @@ gpointer user_data) { gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; CdSensor *sensor = CD_SENSOR (source_object); GMainLoop *loop = (GMainLoop *) user_data; @@ -53,7 +53,7 @@ { guint retval = 0; gboolean ret; - GError *error = NULL; + g_autoptr(GError) error = NULL; GString *data = NULL; GOptionContext *context; CdSensor *sensor; @@ -78,7 +78,6 @@ if (!ret) { g_print ("FAILED: Failed to load sensor: %s\n", error->message); - g_error_free (error); goto out; } @@ -94,7 +93,6 @@ ret = cd_sensor_dump (sensor, data, &error); if (!ret) { g_print ("FAILED: Failed to dump sensor: %s\n", error->message); - g_error_free (error); goto out; } @@ -102,7 +100,6 @@ ret = g_file_set_contents (filename, data->str, data->len, &error); if (!ret) { g_print ("FAILED: Failed to write file: %s\n", error->message); - g_error_free (error); goto out; } diff -Nru colord-1.2.12/src/sensors/cd-sensor-huey.c colord-1.3.2/src/sensors/cd-sensor-huey.c --- colord-1.2.12/src/sensors/cd-sensor-huey.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-huey.c 2016-03-03 09:40:36.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * - * Copyright (C) 2010-2011 Richard Hughes + * Copyright (C) 2010-2015 Richard Hughes * * Licensed under the GNU General Public License Version 2 * @@ -30,8 +30,6 @@ #include #include -#include "cd-cleanup.h" - #include "../src/cd-sensor.h" typedef struct @@ -40,17 +38,6 @@ HueyCtx *ctx; } CdSensorHueyPrivate; -/* async state for the sensor readings */ -typedef struct { - gboolean ret; - CdColorXYZ *sample; - gulong cancellable_id; - GCancellable *cancellable; - GSimpleAsyncResult *res; - CdSensor *sensor; - CdSensorCap current_cap; -} CdSensorAsyncState; - static CdSensorHueyPrivate * cd_sensor_huey_get_private (CdSensor *sensor) { @@ -58,91 +45,61 @@ } static void -cd_sensor_huey_get_sample_state_finish (CdSensorAsyncState *state, - const GError *error) -{ - /* set result to temp memory location */ - if (state->ret) { - g_simple_async_result_set_op_res_gpointer (state->res, - state->sample, - (GDestroyNotify) cd_color_xyz_free); - } else { - g_simple_async_result_set_from_error (state->res, error); - } - - /* deallocate */ - if (state->cancellable != NULL) { - g_cancellable_disconnect (state->cancellable, state->cancellable_id); - g_object_unref (state->cancellable); - } - - g_object_unref (state->res); - g_object_unref (state->sensor); - g_slice_free (CdSensorAsyncState, state); -} - -static void -cd_sensor_huey_cancellable_cancel_cb (GCancellable *cancellable, - CdSensorAsyncState *state) -{ - g_warning ("cancelled huey"); -} - -static void -cd_sensor_huey_get_ambient_thread_cb (GSimpleAsyncResult *res, - GObject *object, +cd_sensor_huey_get_ambient_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable) { - GError *error = NULL; - CdSensor *sensor = CD_SENSOR (object); + g_autoptr(GError) error = NULL; + CdSensor *sensor = CD_SENSOR (source_object); CdSensorHueyPrivate *priv = cd_sensor_huey_get_private (sensor); - CdSensorAsyncState *state = (CdSensorAsyncState *) g_object_get_data (G_OBJECT (cancellable), "state"); + CdColorXYZ sample; /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_MEASURING); + cd_sensor_set_state_in_idle (sensor, CD_SENSOR_STATE_MEASURING); /* hit hardware */ - state->sample->X = huey_device_get_ambient (priv->device, &error); - if (state->sample->X < 0) { - cd_sensor_huey_get_sample_state_finish (state, error); - g_error_free (error); - goto out; + cd_color_xyz_clear (&sample); + sample.X = huey_device_get_ambient (priv->device, &error); + if (sample.X < 0) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "%s", error->message); + return; } /* success */ - state->ret = TRUE; - cd_sensor_huey_get_sample_state_finish (state, NULL); -out: - /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); + g_task_return_pointer (task, + cd_color_xyz_dup (&sample), + (GDestroyNotify) cd_color_xyz_free); } static void -cd_sensor_huey_sample_thread_cb (GSimpleAsyncResult *res, - GObject *object, +cd_sensor_huey_sample_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable) { - CdSensor *sensor = CD_SENSOR (object); - CdSensorAsyncState *state = (CdSensorAsyncState *) g_object_get_data (G_OBJECT (cancellable), "state"); + CdSensor *sensor = CD_SENSOR (source_object); CdSensorHueyPrivate *priv = cd_sensor_huey_get_private (sensor); - _cleanup_error_free_ GError *error = NULL; + CdSensorCap cap = GPOINTER_TO_UINT (task_data); + CdColorXYZ *sample; + g_autoptr(GError) error = NULL; /* measure */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_MEASURING); - state->sample = huey_ctx_take_sample (priv->ctx, - state->current_cap, - &error); - if (state->sample == NULL) { - cd_sensor_huey_get_sample_state_finish (state, error); - goto out; + cd_sensor_set_state_in_idle (sensor, CD_SENSOR_STATE_MEASURING); + sample = huey_ctx_take_sample (priv->ctx, cap, &error); + if (sample == NULL) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "%s", error->message); + return; } /* save result */ - state->ret = TRUE; - cd_sensor_huey_get_sample_state_finish (state, NULL); -out: - /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); + g_task_return_pointer (task, sample, NULL); } void @@ -152,72 +109,36 @@ GAsyncReadyCallback callback, gpointer user_data) { - CdSensorAsyncState *state; - GCancellable *tmp; - + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - - /* save state */ - state = g_slice_new0 (CdSensorAsyncState); - state->res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_get_sample_async); - state->sensor = g_object_ref (sensor); - if (cancellable != NULL) { - state->cancellable = g_object_ref (cancellable); - state->cancellable_id = g_cancellable_connect (cancellable, G_CALLBACK (cd_sensor_huey_cancellable_cancel_cb), state, NULL); - } - - /* run in a thread */ - tmp = g_cancellable_new (); - g_object_set_data (G_OBJECT (tmp), "state", state); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_set_task_data (task, GUINT_TO_POINTER (cap), NULL); if (cap == CD_SENSOR_CAP_AMBIENT) { - g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res), - cd_sensor_huey_get_ambient_thread_cb, - 0, - (GCancellable*) tmp); + g_task_run_in_thread (task, cd_sensor_huey_get_ambient_thread_cb); } else { - g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res), - cd_sensor_huey_sample_thread_cb, - 0, - (GCancellable*) tmp); + g_task_run_in_thread (task, cd_sensor_huey_sample_thread_cb); } - g_object_unref (tmp); } CdColorXYZ * -cd_sensor_get_sample_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), NULL); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - /* failed */ - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - - /* grab detail */ - return cd_color_xyz_dup (g_simple_async_result_get_op_res_gpointer (simple)); +cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); } static void -cd_sensor_huey_lock_thread_cb (GSimpleAsyncResult *res, - GObject *object, +cd_sensor_huey_lock_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable) { - CdSensor *sensor = CD_SENSOR (object); + CdSensor *sensor = CD_SENSOR (source_object); CdSensorHueyPrivate *priv = cd_sensor_huey_get_private (sensor); const guint8 spin_leds[] = { 0x0, 0x1, 0x2, 0x4, 0x8, 0x4, 0x2, 0x1, 0x0, 0xff }; - gboolean ret = FALSE; guint i; - _cleanup_error_free_ GError *error = NULL; - _cleanup_free_ gchar *serial_number_tmp = NULL; + g_autoptr(GError) error = NULL; + g_autofree gchar *serial_number_tmp = NULL; /* try to find the USB device */ priv->device = cd_sensor_open_usb_device (sensor, @@ -225,50 +146,64 @@ 0x00, /* interface */ &error); if (priv->device == NULL) { - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); - g_simple_async_result_set_from_error (res, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); goto out; } huey_ctx_set_device (priv->ctx, priv->device); /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_STARTING); + cd_sensor_set_state_in_idle (sensor, CD_SENSOR_STATE_STARTING); /* unlock */ - ret = huey_device_unlock (priv->device, &error); - if (!ret) { - g_simple_async_result_set_from_error (res, error); + if (!huey_device_unlock (priv->device, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); goto out; } /* get serial number */ serial_number_tmp = huey_device_get_serial_number (priv->device, &error); if (serial_number_tmp == NULL) { - g_simple_async_result_set_from_error (res, error); + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "%s", error->message); goto out; } cd_sensor_set_serial (sensor, serial_number_tmp); g_debug ("Serial number: %s", serial_number_tmp); /* setup sensor */ - ret = huey_ctx_setup (priv->ctx, &error); - if (!ret) { - g_simple_async_result_set_from_error (res, error); + if (!huey_ctx_setup (priv->ctx, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); goto out; } /* spin the LEDs */ for (i = 0; spin_leds[i] != 0xff; i++) { - ret = huey_device_set_leds (priv->device, spin_leds[i], &error); - if (!ret) { - g_simple_async_result_set_from_error (res, error); + if (!huey_device_set_leds (priv->device, spin_leds[i], &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); goto out; } g_usleep (50000); } + + /* success */ + g_task_return_boolean (task, TRUE); out: /* set state */ - cd_sensor_set_state (sensor, CD_SENSOR_STATE_IDLE); + cd_sensor_set_state_in_idle (sensor, CD_SENSOR_STATE_IDLE); } void @@ -277,61 +212,43 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - - /* run in a thread */ - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_lock_async); - g_simple_async_result_run_in_thread (res, - cd_sensor_huey_lock_thread_cb, - 0, - cancellable); - g_object_unref (res); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_run_in_thread (task, cd_sensor_huey_lock_thread_cb); } gboolean -cd_sensor_lock_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - return TRUE; +cd_sensor_lock_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } static void -cd_sensor_unlock_thread_cb (GSimpleAsyncResult *res, - GObject *object, +cd_sensor_unlock_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, GCancellable *cancellable) { - CdSensor *sensor = CD_SENSOR (object); + CdSensor *sensor = CD_SENSOR (source_object); CdSensorHueyPrivate *priv = cd_sensor_huey_get_private (sensor); - gboolean ret = FALSE; - _cleanup_error_free_ GError *error = NULL; + g_autoptr(GError) error = NULL; /* close */ if (priv->device != NULL) { - ret = g_usb_device_close (priv->device, &error); - if (!ret) { - g_simple_async_result_set_from_error (res, error); + if (!g_usb_device_close (priv->device, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); return; } - - /* clear */ - g_object_unref (priv->device); - priv->device = NULL; + g_clear_object (&priv->device); } + + /* success */ + g_task_return_boolean (task, TRUE); } void @@ -340,37 +257,17 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *res; - + g_autoptr(GTask) task = NULL; g_return_if_fail (CD_IS_SENSOR (sensor)); - - /* run in a thread */ - res = g_simple_async_result_new (G_OBJECT (sensor), - callback, - user_data, - cd_sensor_unlock_async); - g_simple_async_result_run_in_thread (res, - cd_sensor_unlock_thread_cb, - 0, - cancellable); - g_object_unref (res); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_run_in_thread (task, cd_sensor_unlock_thread_cb); } gboolean -cd_sensor_unlock_finish (CdSensor *sensor, - GAsyncResult *res, - GError **error) -{ - GSimpleAsyncResult *simple; - - g_return_val_if_fail (CD_IS_SENSOR (sensor), FALSE); - g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - simple = G_SIMPLE_ASYNC_RESULT (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - return TRUE; +cd_sensor_unlock_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); } gboolean diff -Nru colord-1.2.12/src/sensors/cd-sensor-huey.h colord-1.3.2/src/sensors/cd-sensor-huey.h --- colord-1.2.12/src/sensors/cd-sensor-huey.h 2015-04-22 09:56:46.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-huey.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Copyright (C) 2010 Richard Hughes - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __CD_SENSOR_HUEY_H -#define __CD_SENSOR_HUEY_H - -#include - -#include "cd-sensor.h" - -G_BEGIN_DECLS - -#define CD_TYPE_SENSOR_HUEY (cd_sensor_huey_get_type ()) -#define CD_SENSOR_HUEY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_SENSOR_HUEY, CdSensorHuey)) -#define CD_SENSOR_HUEY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_SENSOR_HUEY, CdSensorHueyClass)) -#define CD_IS_SENSOR_HUEY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_SENSOR_HUEY)) - -typedef struct _CdSensorHueyPrivate CdSensorHueyPrivate; -typedef struct _CdSensorHuey CdSensorHuey; -typedef struct _CdSensorHueyClass CdSensorHueyClass; - -struct _CdSensorHuey -{ - CdSensor parent; - CdSensorHueyPrivate *priv; -}; - -struct _CdSensorHueyClass -{ - CdSensorClass parent_class; -}; - -GType cd_sensor_huey_get_type (void); -CdSensor *cd_sensor_huey_new (void); - -G_END_DECLS - -#endif /* __CD_SENSOR_HUEY_H */ - diff -Nru colord-1.2.12/src/sensors/cd-sensor-spark.c colord-1.3.2/src/sensors/cd-sensor-spark.c --- colord-1.2.12/src/sensors/cd-sensor-spark.c 1970-01-01 00:00:00.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-sensor-spark.c 2016-03-03 09:41:17.000000000 +0000 @@ -0,0 +1,700 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2015 Richard Hughes + * + * Licensed under the GNU General Public License Version 2 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/** + * This object implements a driver for the OceanOptics SPark hardware. + */ + +#include "config.h" + +#include +#include +#include + +#include "../src/cd-sensor.h" + +typedef struct +{ + GUsbDevice *device; + CdSpectrum *dark_cal; + CdSpectrum *irradiance_cal; + GFile *dark_cal_file; + GFile *irradiance_cal_file; + CdSpectrum *sensitivity_cal; +} CdSensorSparkPrivate; + +static CdSensorSparkPrivate * +cd_sensor_spark_get_private (CdSensor *sensor) +{ + return g_object_get_data (G_OBJECT (sensor), "priv"); +} + +static CdSpectrum * +cd_sensor_spark_get_dark_calibration (CdSensor *sensor, GError **error) +{ + CdSensorSparkPrivate *priv = cd_sensor_spark_get_private (sensor); + CdSpectrum *sp; + const gchar *kind; + g_autoptr(CdIt8) it8 = NULL; + g_autoptr(GError) error_local = NULL; + + /* take a baseline (hopefully black) */ + sp = osp_device_take_spectrum (priv->device, &error_local); + if (sp == NULL) { + g_set_error (error, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "failed to get spectrum: %s", + error_local->message); + return NULL; + } + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (sp, 180, 20); + g_print ("DARKCAL\n%s", txt); + } + + /* save locally */ + if (priv->dark_cal != NULL) + cd_spectrum_free (priv->dark_cal); + priv->dark_cal = cd_spectrum_dup (sp); + cd_spectrum_set_id (priv->dark_cal, "1"); + + /* save to file */ + it8 = cd_it8_new (); + kind = cd_sensor_kind_to_string (cd_sensor_get_kind (sensor)); + cd_it8_set_instrument (it8, kind); + cd_it8_set_kind (it8, CD_IT8_KIND_SPECT); + cd_it8_set_originator (it8, "colord"); + cd_it8_set_normalized (it8, FALSE); + cd_it8_set_spectral (it8, TRUE); + cd_it8_set_enable_created (it8, TRUE); + cd_it8_set_title (it8, "Dark Calibration"); + cd_it8_add_spectrum (it8, sp); + if (!cd_it8_save_to_file (it8, + priv->dark_cal_file, + &error_local)) { + g_set_error (error, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "failed to save dark calibration: %s", + error_local->message); + return NULL; + } + + return sp; +} + +static CdSpectrum * +cd_sensor_spark_get_irradiance_calibration (CdSensor *sensor, CdSpectrum *sp_in, GError **error) +{ + CdSensorSparkPrivate *priv = cd_sensor_spark_get_private (sensor); + CdSpectrum *sp; + const gchar *kind; + guint i; + g_autoptr(CdIt8) it8 = NULL; + g_autoptr(CdSpectrum) sp_black_body = NULL; + g_autoptr(GError) error_local = NULL; + + /* create reference spectra for a halogen bulb */ + sp_black_body = cd_spectrum_planckian_new_full (3200, + cd_spectrum_get_start (sp_in), + cd_spectrum_get_end (sp_in), + 1); + cd_spectrum_normalize_max (sp_black_body, 1.f); + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (sp_black_body, 180, 20); + g_print ("BLACKBODY@3200K\n%s", txt); + } + + /* normalize the sensor result too */ + cd_spectrum_normalize_max (sp_in, 1.f); + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (sp_in, 180, 20); + g_print ("NORMALIZED-SENSOR-RESPONSE\n%s", txt); + } + + /* resample, calculating the correction curve */ + sp = cd_spectrum_new (); + cd_spectrum_set_start (sp, cd_spectrum_get_start (sp_in)); + cd_spectrum_set_end (sp, cd_spectrum_get_end (sp_in)); + for (i = cd_spectrum_get_start (sp); i < cd_spectrum_get_end (sp); i += 5) { + gdouble ref; + gdouble val; + ref = cd_spectrum_get_value_for_nm (sp_black_body, i); + val = cd_spectrum_get_value_for_nm (sp_in, i); + cd_spectrum_add_value (sp, ref / val); + } + cd_spectrum_normalize_max (sp, 1.f); + + /* try to use this to recreate the black body model */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + g_autoptr(CdSpectrum) sp_test = NULL; + sp_test = cd_spectrum_multiply (sp, sp_in, 5); + cd_spectrum_normalize_max (sp_test, 1.f); + txt = cd_spectrum_to_string (sp_test, 180, 20); + g_print ("CALIBRATED-RESPONSE\n%s", txt); + } + + /* save locally */ + if (priv->irradiance_cal != NULL) + cd_spectrum_free (priv->irradiance_cal); + priv->irradiance_cal = cd_spectrum_dup (sp); + cd_spectrum_set_id (priv->irradiance_cal, "1"); + + /* save to file */ + it8 = cd_it8_new (); + kind = cd_sensor_kind_to_string (cd_sensor_get_kind (sensor)); + cd_it8_set_instrument (it8, kind); + cd_it8_set_kind (it8, CD_IT8_KIND_SPECT); + cd_it8_set_originator (it8, "colord"); + cd_it8_set_normalized (it8, FALSE); + cd_it8_set_spectral (it8, TRUE); + cd_it8_set_enable_created (it8, TRUE); + cd_it8_set_title (it8, "Dark Calibration"); + cd_it8_add_spectrum (it8, sp); + if (!cd_it8_save_to_file (it8, + priv->irradiance_cal_file, + &error_local)) { + g_set_error (error, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "failed to save irradiance calibration: %s", + error_local->message); + return NULL; + } + + + return sp; +} + +static CdSpectrum * +cd_sensor_spark_get_spectrum (CdSensor *sensor, + CdSensorCap cap, + GError **error) +{ + CdSensorSparkPrivate *priv = cd_sensor_spark_get_private (sensor); + CdSpectrum *sp; + g_autoptr(CdSpectrum) sp_tmp = NULL; + g_autoptr(CdSpectrum) sp_biased = NULL; + g_autoptr(GError) error_local = NULL; + + /* measure */ + cd_sensor_set_state_in_idle (sensor, CD_SENSOR_STATE_MEASURING); + + /* perform dark calibration */ + if (cap == CD_SENSOR_CAP_CALIBRATION_DARK) + return cd_sensor_spark_get_dark_calibration (sensor, error); + + /* we have no dark calibration */ + if (priv->dark_cal == NULL || + cd_spectrum_get_size (priv->dark_cal) == 0) { + g_set_error_literal (error, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_REQUIRED_DARK_CALIBRATION, + "no dark calibration provided"); + return NULL; + } + + /* get the spectrum */ + sp_tmp = osp_device_take_spectrum (priv->device, &error_local); + if (sp_tmp == NULL) { + g_set_error (error, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "failed to get spectrum: %s", + error_local->message); + return NULL; + } + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (sp_tmp, 180, 20); + g_print ("RAW\n%s", txt); + } + + /* we don't have a method for getting this accurately yet */ + if (FALSE) { + /* we have an invalid dark calibration */ + if (cd_spectrum_get_size (sp_tmp) != + cd_spectrum_get_size (priv->dark_cal)) { + g_set_error_literal (error, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_REQUIRED_DARK_CALIBRATION, + "dark calibration was invalid"); + return NULL; + } + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (priv->dark_cal, 180, 20); + g_print ("DARKCAL\n%s", txt); + } + + /* subtract the dark calibration */ + sp_biased = cd_spectrum_subtract (sp_tmp, priv->dark_cal, 5); + if (sp_biased == NULL) { + g_set_error_literal (error, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "failed to get subtract spectra"); + return NULL; + } + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (sp_biased, 180, 20); + g_print ("RAW-DARKCAL\n%s", txt); + } + } else { + sp_biased = cd_spectrum_dup (sp_tmp); + } + + /* ensure we never have negative readings */ + cd_spectrum_limit_min (sp_biased, 0.f); + + /* perform irradiance calibration */ + if (cap == CD_SENSOR_CAP_CALIBRATION_IRRADIANCE) { + sp = cd_sensor_spark_get_irradiance_calibration (sensor, sp_biased, error); + if (sp == NULL) + return NULL; + } else { + g_autoptr(CdSpectrum) sp_resampled = NULL; + g_autoptr(CdSpectrum) sp_irradiance = NULL; + + /* we have no irradiance calibration */ + if (priv->irradiance_cal == NULL || + cd_spectrum_get_size (priv->irradiance_cal) == 0) { + g_set_error_literal (error, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_REQUIRED_IRRADIANCE_CALIBRATION, + "no irradiance calibration provided"); + return NULL; + } + + /* resample to a linear data space */ + sp_resampled = cd_spectrum_resample (sp_biased, + cd_spectrum_get_start (sp_biased), + cd_spectrum_get_end (sp_biased), + 5); + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (sp_resampled, 180, 20); + g_print ("RESAMPLED\n%s", txt); + } + + /* multiply with the irradiance calibration */ + sp_irradiance = cd_spectrum_multiply (sp_resampled, priv->irradiance_cal, 1); + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (priv->irradiance_cal, 180, 20); + g_print ("IRRADIANCECAL\n%s", txt); + } + + /* multiply the spectrum with the sensitivity factor */ + sp = cd_spectrum_multiply (sp_irradiance, priv->sensitivity_cal, 1); + } + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (sp, 180, 20); + g_print ("FINAL\n%s", txt); + } + return sp; +} + +static void +cd_sensor_spark_sample_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) +{ + CdSensor *sensor = CD_SENSOR (source_object); + CdSensorCap cap = GPOINTER_TO_UINT (task_data); + CdSpectrum *illuminant = NULL; + g_autoptr(CdColorXYZ) sample = NULL; + g_autoptr(CdIt8) it8_cmf = NULL; + g_autoptr(CdIt8) it8_d65 = NULL; + g_autoptr(CdSpectrum) sp = NULL; + g_autoptr(GError) error = NULL; + g_autoptr(GFile) file_cmf = NULL; + g_autoptr(GFile) file_illuminant = NULL; + + /* get the correct spectra */ + sp = cd_sensor_spark_get_spectrum (sensor, cap, &error); + if (sp == NULL) { + g_task_return_new_error (task, + error->domain, + error->code, + "%s", error->message); + return; + } + + /* return dummy data */ + if (cap == CD_SENSOR_CAP_CALIBRATION) { + CdColorXYZ *sample_tmp = NULL; + sample_tmp = cd_color_xyz_new (); + g_task_return_pointer (task, sample_tmp, NULL); + return; + } + + /* load CIE1931 */ + it8_cmf = cd_it8_new (); + file_cmf = g_file_new_for_path ("/usr/share/colord/cmf/CIE1931-2deg-XYZ.cmf"); + if (!cd_it8_load_from_file (it8_cmf, file_cmf, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT, + "%s", error->message); + return; + } + + /* load D65 */ + it8_d65 = cd_it8_new (); + file_illuminant = g_file_new_for_path ("/usr/share/colord/illuminant/CIE-D65.sp"); + if (!cd_it8_load_from_file (it8_d65, file_illuminant, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_SUPPORT, + "%s", error->message); + return; + } + illuminant = cd_it8_get_spectrum_by_id (it8_d65, "1"); + g_assert (illuminant != NULL); + + /* convert to XYZ */ + sample = cd_color_xyz_new (); + if (!cd_it8_utils_calculate_xyz_from_cmf (it8_cmf, illuminant, + sp, sample, + 1.f, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); + return; + } + + /* success */ + g_task_return_pointer (task, sample, NULL); + sample = NULL; +} + +void +cd_sensor_get_sample_async (CdSensor *sensor, + CdSensorCap cap, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_autoptr(GTask) task = NULL; + g_return_if_fail (CD_IS_SENSOR (sensor)); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_set_task_data (task, GUINT_TO_POINTER (cap), NULL); + g_task_run_in_thread (task, cd_sensor_spark_sample_thread_cb); +} + +CdColorXYZ * +cd_sensor_get_sample_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); +} + +static void +cd_sensor_spark_spectrum_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) +{ + CdSensor *sensor = CD_SENSOR (source_object); + CdSensorCap cap = GPOINTER_TO_UINT (task_data); + CdSpectrum *spectrum; + GError *error = NULL; + + /* success */ + spectrum = cd_sensor_spark_get_spectrum (sensor, cap, &error); + if (spectrum == NULL) { + g_task_return_error (task, error); + return; + } + g_task_return_pointer (task, spectrum, NULL); +} + +void +cd_sensor_get_spectrum_async (CdSensor *sensor, + CdSensorCap cap, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_autoptr(GTask) task = NULL; + g_return_if_fail (CD_IS_SENSOR (sensor)); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_set_task_data (task, GUINT_TO_POINTER (cap), NULL); + g_task_run_in_thread (task, cd_sensor_spark_spectrum_thread_cb); +} + +CdSpectrum * +cd_sensor_get_spectrum_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), NULL); + return g_task_propagate_pointer (G_TASK (res), error); +} + +static void +cd_sensor_spark_lock_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) +{ + CdSensor *sensor = CD_SENSOR (source_object); + CdSensorSparkPrivate *priv = cd_sensor_spark_get_private (sensor); + g_autoptr(GError) error = NULL; + g_autofree gchar *serial_number_tmp = NULL; + g_autofree gchar *fn = NULL; + + /* try to find the USB device */ + priv->device = cd_sensor_open_usb_device (sensor, + 0x01, /* config */ + 0x00, /* interface */ + &error); + if (priv->device == NULL) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); + return; + } + + /* set state */ + cd_sensor_set_state_in_idle (sensor, CD_SENSOR_STATE_STARTING); + + /* get serial number */ + serial_number_tmp = osp_device_get_serial (priv->device, &error); + if (serial_number_tmp == NULL) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "%s", error->message); + return; + } + cd_sensor_set_serial (sensor, serial_number_tmp); + g_debug ("Serial number: %s", serial_number_tmp); + + /* can we load a dark calibration? */ + fn = g_strdup_printf ("/var/lib/colord/sensor-%s-dark-cal-%s.sp", + cd_sensor_kind_to_string (cd_sensor_get_kind (sensor)), + serial_number_tmp); + priv->dark_cal_file = g_file_new_for_path (fn); + if (g_file_query_exists (priv->dark_cal_file, NULL)) { + g_autoptr(CdIt8) it8 = cd_it8_new (); + if (!cd_it8_load_from_file (it8, + priv->dark_cal_file, + &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "%s", error->message); + return; + } + priv->dark_cal = cd_spectrum_dup (cd_it8_get_spectrum_by_id (it8, "1")); + g_debug ("loaded dark calibration with %i elements", + cd_spectrum_get_size (priv->dark_cal)); + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (priv->dark_cal, 180, 20); + g_print ("DARKCAL:\n%s", txt); + } + } + + /* can we load a irradiance calibration? */ + fn = g_strdup_printf ("/var/lib/colord/sensor-%s-irradiance-cal-%s.sp", + cd_sensor_kind_to_string (cd_sensor_get_kind (sensor)), + serial_number_tmp); + priv->irradiance_cal_file = g_file_new_for_path (fn); + if (g_file_query_exists (priv->irradiance_cal_file, NULL)) { + g_autoptr(CdIt8) it8 = cd_it8_new (); + if (!cd_it8_load_from_file (it8, + priv->irradiance_cal_file, + &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_NO_DATA, + "%s", error->message); + return; + } + priv->irradiance_cal = cd_spectrum_dup (cd_it8_get_spectrum_by_id (it8, "1")); + g_debug ("loaded irradiance calibration with %i elements", + cd_spectrum_get_size (priv->irradiance_cal)); + + /* print something for debugging */ + if (g_getenv ("SPARK_DEBUG") != NULL) { + g_autofree gchar *txt = NULL; + txt = cd_spectrum_to_string (priv->irradiance_cal, 180, 20); + g_print ("IRRADIANCECAL:\n%s", txt); + } + } + + /* load the sensor sensitivity from a file */ + priv->sensitivity_cal = cd_spectrum_new (); + cd_spectrum_set_start (priv->sensitivity_cal, 0); + cd_spectrum_set_end (priv->sensitivity_cal, 1000); + cd_spectrum_add_value (priv->sensitivity_cal, 34210); // <- FIXME: this needs to come from the device itself + + /* success */ + g_task_return_boolean (task, TRUE); +} + +void +cd_sensor_lock_async (CdSensor *sensor, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_autoptr(GTask) task = NULL; + g_return_if_fail (CD_IS_SENSOR (sensor)); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_run_in_thread (task, cd_sensor_spark_lock_thread_cb); +} + +gboolean +cd_sensor_lock_finish (CdSensor *sensor, + GAsyncResult *res, + GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); +} + +static void +cd_sensor_unlock_thread_cb (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) +{ + CdSensor *sensor = CD_SENSOR (source_object); + CdSensorSparkPrivate *priv = cd_sensor_spark_get_private (sensor); + g_autoptr(GError) error = NULL; + + /* close */ + if (priv->device != NULL) { + if (!g_usb_device_close (priv->device, &error)) { + g_task_return_new_error (task, + CD_SENSOR_ERROR, + CD_SENSOR_ERROR_INTERNAL, + "%s", error->message); + return; + } + g_clear_object (&priv->device); + } + + /* clear up the stuff we allocated in Lock() */ + g_clear_object (&priv->dark_cal_file); + if (priv->sensitivity_cal != NULL) { + cd_spectrum_free (priv->sensitivity_cal); + priv->sensitivity_cal = NULL; + } + if (priv->dark_cal != NULL) { + cd_spectrum_free (priv->dark_cal); + priv->dark_cal = NULL; + } + g_clear_object (&priv->irradiance_cal_file); + if (priv->sensitivity_cal != NULL) { + cd_spectrum_free (priv->sensitivity_cal); + priv->sensitivity_cal = NULL; + } + if (priv->irradiance_cal != NULL) { + cd_spectrum_free (priv->irradiance_cal); + priv->irradiance_cal = NULL; + } + + /* success */ + g_task_return_boolean (task, TRUE); +} + +void +cd_sensor_unlock_async (CdSensor *sensor, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_autoptr(GTask) task = NULL; + g_return_if_fail (CD_IS_SENSOR (sensor)); + task = g_task_new (sensor, cancellable, callback, user_data); + g_task_run_in_thread (task, cd_sensor_unlock_thread_cb); +} + +gboolean +cd_sensor_unlock_finish (CdSensor *sensor, GAsyncResult *res, GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, sensor), FALSE); + return g_task_propagate_boolean (G_TASK (res), error); +} + +static void +cd_sensor_unref_private (CdSensorSparkPrivate *priv) +{ + if (priv->device != NULL) + g_object_unref (priv->device); + if (priv->dark_cal != NULL) + cd_spectrum_free (priv->dark_cal); + if (priv->irradiance_cal != NULL) + cd_spectrum_free (priv->irradiance_cal); + g_free (priv); +} + +gboolean +cd_sensor_coldplug (CdSensor *sensor, GError **error) +{ + CdSensorSparkPrivate *priv; + guint64 caps = cd_bitfield_from_enums (CD_SENSOR_CAP_LCD, + CD_SENSOR_CAP_CRT, + CD_SENSOR_CAP_CALIBRATION_DARK, + CD_SENSOR_CAP_CALIBRATION_IRRADIANCE, + CD_SENSOR_CAP_PLASMA, + CD_SENSOR_CAP_SPECTRAL, + -1); + g_object_set (sensor, + "native", TRUE, + "kind", CD_SENSOR_KIND_SPARK, + "caps", caps, + NULL); + /* create private data */ + priv = g_new0 (CdSensorSparkPrivate, 1); + g_object_set_data_full (G_OBJECT (sensor), "priv", priv, + (GDestroyNotify) cd_sensor_unref_private); + return TRUE; +} diff -Nru colord-1.2.12/src/sensors/cd-spawn.c colord-1.3.2/src/sensors/cd-spawn.c --- colord-1.2.12/src/sensors/cd-spawn.c 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/sensors/cd-spawn.c 2015-10-13 15:24:13.000000000 +0000 @@ -40,7 +40,6 @@ #include -#include "cd-cleanup.h" #include "cd-spawn.h" static void cd_spawn_finalize (GObject *object); @@ -102,7 +101,7 @@ guint i; guint size; guint bytes_processed; - _cleanup_strv_free_ gchar **lines = NULL; + g_auto(GStrv) lines = NULL; /* if nothing then don't emit */ if (string->len == 0) @@ -366,7 +365,7 @@ { gint wrote; gint length; - _cleanup_free_ gchar *buffer = NULL; + g_autofree gchar *buffer = NULL; g_return_val_if_fail (CD_IS_SPAWN (spawn), FALSE); @@ -408,7 +407,7 @@ guint i; guint len; gint rc; - _cleanup_error_free_ GError *error_local = NULL; + g_autoptr(GError) error_local = NULL; g_return_val_if_fail (CD_IS_SPAWN (spawn), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); diff -Nru colord-1.2.12/src/sensors/Makefile.am colord-1.3.2/src/sensors/Makefile.am --- colord-1.2.12/src/sensors/Makefile.am 2015-05-01 15:24:15.000000000 +0000 +++ colord-1.3.2/src/sensors/Makefile.am 2015-10-14 17:09:55.000000000 +0000 @@ -81,13 +81,22 @@ if HAVE_GUSB plugin_LTLIBRARIES += \ + libcolord_sensor_spark.la \ libcolord_sensor_colorhug.la \ libcolord_sensor_dtp94.la \ libcolord_sensor_huey.la +libcolord_sensor_spark_la_SOURCES = \ + cd-sensor-spark.c +libcolord_sensor_spark_la_LIBADD = \ + $(GLIB_LIBS) \ + $(GUSB_LIBS) \ + $(top_builddir)/lib/ospark/libospark-private.la +libcolord_sensor_spark_la_LDFLAGS = -module -avoid-version +libcolord_sensor_spark_la_CFLAGS = $(WARNINGFLAGS_C) + libcolord_sensor_huey_la_SOURCES = \ - cd-sensor-huey.c \ - cd-sensor-huey.h + cd-sensor-huey.c libcolord_sensor_huey_la_LIBADD = \ $(GLIB_LIBS) \ $(GUSB_LIBS) \ @@ -96,8 +105,7 @@ libcolord_sensor_huey_la_CFLAGS = $(WARNINGFLAGS_C) libcolord_sensor_dtp94_la_SOURCES = \ - cd-sensor-dtp94.c \ - cd-sensor-dtp94.h + cd-sensor-dtp94.c libcolord_sensor_dtp94_la_LIBADD = \ $(GLIB_LIBS) \ $(GUSB_LIBS) \ @@ -106,8 +114,7 @@ libcolord_sensor_dtp94_la_CFLAGS = $(WARNINGFLAGS_C) libcolord_sensor_colorhug_la_SOURCES = \ - cd-sensor-colorhug.c \ - cd-sensor-colorhug.h + cd-sensor-colorhug.c libcolord_sensor_colorhug_la_LIBADD = \ $(GLIB_LIBS) \ $(GUSB_LIBS) \ diff -Nru colord-1.2.12/src/sensors/Makefile.in colord-1.3.2/src/sensors/Makefile.in --- colord-1.2.12/src/sensors/Makefile.in 2015-07-20 09:49:01.000000000 +0000 +++ colord-1.3.2/src/sensors/Makefile.in 2016-02-17 13:32:56.000000000 +0000 @@ -92,6 +92,7 @@ @CD_BUILD_REVERSE_TRUE@noinst_PROGRAMS = cd-sensor-dump$(EXEEXT) \ @CD_BUILD_REVERSE_TRUE@ cd-parse-beagle$(EXEEXT) @HAVE_GUSB_TRUE@am__append_1 = \ +@HAVE_GUSB_TRUE@ libcolord_sensor_spark.la \ @HAVE_GUSB_TRUE@ libcolord_sensor_colorhug.la \ @HAVE_GUSB_TRUE@ libcolord_sensor_dtp94.la \ @HAVE_GUSB_TRUE@ libcolord_sensor_huey.la @@ -173,8 +174,7 @@ @HAVE_GUSB_TRUE@libcolord_sensor_colorhug_la_DEPENDENCIES = \ @HAVE_GUSB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @HAVE_GUSB_TRUE@ $(top_builddir)/lib/colorhug/libcolorhug.la -am__libcolord_sensor_colorhug_la_SOURCES_DIST = cd-sensor-colorhug.c \ - cd-sensor-colorhug.h +am__libcolord_sensor_colorhug_la_SOURCES_DIST = cd-sensor-colorhug.c @HAVE_GUSB_TRUE@am_libcolord_sensor_colorhug_la_OBJECTS = libcolord_sensor_colorhug_la-cd-sensor-colorhug.lo libcolord_sensor_colorhug_la_OBJECTS = \ $(am_libcolord_sensor_colorhug_la_OBJECTS) @@ -187,8 +187,7 @@ @HAVE_GUSB_TRUE@libcolord_sensor_dtp94_la_DEPENDENCIES = \ @HAVE_GUSB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @HAVE_GUSB_TRUE@ $(top_builddir)/lib/dtp94/libdtp94-private.la -am__libcolord_sensor_dtp94_la_SOURCES_DIST = cd-sensor-dtp94.c \ - cd-sensor-dtp94.h +am__libcolord_sensor_dtp94_la_SOURCES_DIST = cd-sensor-dtp94.c @HAVE_GUSB_TRUE@am_libcolord_sensor_dtp94_la_OBJECTS = \ @HAVE_GUSB_TRUE@ libcolord_sensor_dtp94_la-cd-sensor-dtp94.lo libcolord_sensor_dtp94_la_OBJECTS = \ @@ -211,8 +210,7 @@ @HAVE_GUSB_TRUE@libcolord_sensor_huey_la_DEPENDENCIES = \ @HAVE_GUSB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @HAVE_GUSB_TRUE@ $(top_builddir)/lib/huey/libhuey-private.la -am__libcolord_sensor_huey_la_SOURCES_DIST = cd-sensor-huey.c \ - cd-sensor-huey.h +am__libcolord_sensor_huey_la_SOURCES_DIST = cd-sensor-huey.c @HAVE_GUSB_TRUE@am_libcolord_sensor_huey_la_OBJECTS = \ @HAVE_GUSB_TRUE@ libcolord_sensor_huey_la-cd-sensor-huey.lo libcolord_sensor_huey_la_OBJECTS = \ @@ -223,6 +221,20 @@ $(libcolord_sensor_huey_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_GUSB_TRUE@am_libcolord_sensor_huey_la_rpath = -rpath \ @HAVE_GUSB_TRUE@ $(plugindir) +@HAVE_GUSB_TRUE@libcolord_sensor_spark_la_DEPENDENCIES = \ +@HAVE_GUSB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@HAVE_GUSB_TRUE@ $(top_builddir)/lib/ospark/libospark-private.la +am__libcolord_sensor_spark_la_SOURCES_DIST = cd-sensor-spark.c +@HAVE_GUSB_TRUE@am_libcolord_sensor_spark_la_OBJECTS = \ +@HAVE_GUSB_TRUE@ libcolord_sensor_spark_la-cd-sensor-spark.lo +libcolord_sensor_spark_la_OBJECTS = \ + $(am_libcolord_sensor_spark_la_OBJECTS) +libcolord_sensor_spark_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libcolord_sensor_spark_la_CFLAGS) $(CFLAGS) \ + $(libcolord_sensor_spark_la_LDFLAGS) $(LDFLAGS) -o $@ +@HAVE_GUSB_TRUE@am_libcolord_sensor_spark_la_rpath = -rpath \ +@HAVE_GUSB_TRUE@ $(plugindir) PROGRAMS = $(noinst_PROGRAMS) am__cd_parse_beagle_SOURCES_DIST = cd-parse-beagle.c @CD_BUILD_REVERSE_TRUE@am_cd_parse_beagle_OBJECTS = cd_parse_beagle-cd-parse-beagle.$(OBJEXT) @@ -294,13 +306,15 @@ $(libcolord_sensor_colorhug_la_SOURCES) \ $(libcolord_sensor_dtp94_la_SOURCES) \ $(libcolord_sensor_dummy_la_SOURCES) \ - $(libcolord_sensor_huey_la_SOURCES) $(cd_parse_beagle_SOURCES) \ - $(cd_sensor_dump_SOURCES) + $(libcolord_sensor_huey_la_SOURCES) \ + $(libcolord_sensor_spark_la_SOURCES) \ + $(cd_parse_beagle_SOURCES) $(cd_sensor_dump_SOURCES) DIST_SOURCES = $(am__libcolord_sensor_argyll_la_SOURCES_DIST) \ $(am__libcolord_sensor_colorhug_la_SOURCES_DIST) \ $(am__libcolord_sensor_dtp94_la_SOURCES_DIST) \ $(libcolord_sensor_dummy_la_SOURCES) \ $(am__libcolord_sensor_huey_la_SOURCES_DIST) \ + $(am__libcolord_sensor_spark_la_SOURCES_DIST) \ $(am__cd_parse_beagle_SOURCES_DIST) \ $(am__cd_sensor_dump_SOURCES_DIST) am__can_run_installinfo = \ @@ -441,6 +455,7 @@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_REVISION = @LT_REVISION@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -545,6 +560,7 @@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ +tmpfilesdir = @tmpfilesdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -620,9 +636,18 @@ libcolord_sensor_dummy_la_LIBADD = $(GLIB_LIBS) libcolord_sensor_dummy_la_LDFLAGS = -module -avoid-version libcolord_sensor_dummy_la_CFLAGS = $(WARNINGFLAGS_C) +@HAVE_GUSB_TRUE@libcolord_sensor_spark_la_SOURCES = \ +@HAVE_GUSB_TRUE@ cd-sensor-spark.c + +@HAVE_GUSB_TRUE@libcolord_sensor_spark_la_LIBADD = \ +@HAVE_GUSB_TRUE@ $(GLIB_LIBS) \ +@HAVE_GUSB_TRUE@ $(GUSB_LIBS) \ +@HAVE_GUSB_TRUE@ $(top_builddir)/lib/ospark/libospark-private.la + +@HAVE_GUSB_TRUE@libcolord_sensor_spark_la_LDFLAGS = -module -avoid-version +@HAVE_GUSB_TRUE@libcolord_sensor_spark_la_CFLAGS = $(WARNINGFLAGS_C) @HAVE_GUSB_TRUE@libcolord_sensor_huey_la_SOURCES = \ -@HAVE_GUSB_TRUE@ cd-sensor-huey.c \ -@HAVE_GUSB_TRUE@ cd-sensor-huey.h +@HAVE_GUSB_TRUE@ cd-sensor-huey.c @HAVE_GUSB_TRUE@libcolord_sensor_huey_la_LIBADD = \ @HAVE_GUSB_TRUE@ $(GLIB_LIBS) \ @@ -632,8 +657,7 @@ @HAVE_GUSB_TRUE@libcolord_sensor_huey_la_LDFLAGS = -module -avoid-version @HAVE_GUSB_TRUE@libcolord_sensor_huey_la_CFLAGS = $(WARNINGFLAGS_C) @HAVE_GUSB_TRUE@libcolord_sensor_dtp94_la_SOURCES = \ -@HAVE_GUSB_TRUE@ cd-sensor-dtp94.c \ -@HAVE_GUSB_TRUE@ cd-sensor-dtp94.h +@HAVE_GUSB_TRUE@ cd-sensor-dtp94.c @HAVE_GUSB_TRUE@libcolord_sensor_dtp94_la_LIBADD = \ @HAVE_GUSB_TRUE@ $(GLIB_LIBS) \ @@ -643,8 +667,7 @@ @HAVE_GUSB_TRUE@libcolord_sensor_dtp94_la_LDFLAGS = -module -avoid-version @HAVE_GUSB_TRUE@libcolord_sensor_dtp94_la_CFLAGS = $(WARNINGFLAGS_C) @HAVE_GUSB_TRUE@libcolord_sensor_colorhug_la_SOURCES = \ -@HAVE_GUSB_TRUE@ cd-sensor-colorhug.c \ -@HAVE_GUSB_TRUE@ cd-sensor-colorhug.h +@HAVE_GUSB_TRUE@ cd-sensor-colorhug.c @HAVE_GUSB_TRUE@libcolord_sensor_colorhug_la_LIBADD = \ @HAVE_GUSB_TRUE@ $(GLIB_LIBS) \ @@ -745,6 +768,9 @@ libcolord_sensor_huey.la: $(libcolord_sensor_huey_la_OBJECTS) $(libcolord_sensor_huey_la_DEPENDENCIES) $(EXTRA_libcolord_sensor_huey_la_DEPENDENCIES) $(AM_V_CCLD)$(libcolord_sensor_huey_la_LINK) $(am_libcolord_sensor_huey_la_rpath) $(libcolord_sensor_huey_la_OBJECTS) $(libcolord_sensor_huey_la_LIBADD) $(LIBS) +libcolord_sensor_spark.la: $(libcolord_sensor_spark_la_OBJECTS) $(libcolord_sensor_spark_la_DEPENDENCIES) $(EXTRA_libcolord_sensor_spark_la_DEPENDENCIES) + $(AM_V_CCLD)$(libcolord_sensor_spark_la_LINK) $(am_libcolord_sensor_spark_la_rpath) $(libcolord_sensor_spark_la_OBJECTS) $(libcolord_sensor_spark_la_LIBADD) $(LIBS) + clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -779,6 +805,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcolord_sensor_dtp94_la-cd-sensor-dtp94.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcolord_sensor_dummy_la-cd-sensor-dummy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcolord_sensor_huey_la-cd-sensor-huey.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcolord_sensor_spark_la-cd-sensor-spark.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -843,6 +870,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolord_sensor_huey_la_CFLAGS) $(CFLAGS) -c -o libcolord_sensor_huey_la-cd-sensor-huey.lo `test -f 'cd-sensor-huey.c' || echo '$(srcdir)/'`cd-sensor-huey.c +libcolord_sensor_spark_la-cd-sensor-spark.lo: cd-sensor-spark.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolord_sensor_spark_la_CFLAGS) $(CFLAGS) -MT libcolord_sensor_spark_la-cd-sensor-spark.lo -MD -MP -MF $(DEPDIR)/libcolord_sensor_spark_la-cd-sensor-spark.Tpo -c -o libcolord_sensor_spark_la-cd-sensor-spark.lo `test -f 'cd-sensor-spark.c' || echo '$(srcdir)/'`cd-sensor-spark.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcolord_sensor_spark_la-cd-sensor-spark.Tpo $(DEPDIR)/libcolord_sensor_spark_la-cd-sensor-spark.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cd-sensor-spark.c' object='libcolord_sensor_spark_la-cd-sensor-spark.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolord_sensor_spark_la_CFLAGS) $(CFLAGS) -c -o libcolord_sensor_spark_la-cd-sensor-spark.lo `test -f 'cd-sensor-spark.c' || echo '$(srcdir)/'`cd-sensor-spark.c + cd_parse_beagle-cd-parse-beagle.o: cd-parse-beagle.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cd_parse_beagle_CFLAGS) $(CFLAGS) -MT cd_parse_beagle-cd-parse-beagle.o -MD -MP -MF $(DEPDIR)/cd_parse_beagle-cd-parse-beagle.Tpo -c -o cd_parse_beagle-cd-parse-beagle.o `test -f 'cd-parse-beagle.c' || echo '$(srcdir)/'`cd-parse-beagle.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cd_parse_beagle-cd-parse-beagle.Tpo $(DEPDIR)/cd_parse_beagle-cd-parse-beagle.Po