platform/upstream/libHarfBuzzSharp.git
5 years ago[ci] Remove unnecessary warning declarations
Behdad Esfahbod [Fri, 18 Jan 2019 00:12:07 +0000 (19:12 -0500)]
[ci] Remove unnecessary warning declarations

clang -Weverything still left to be ported to pragmas

5 years ago[pragma] ignored -Wunsafe-loop-optimizations // TODO fix
Behdad Esfahbod [Fri, 18 Jan 2019 00:03:33 +0000 (19:03 -0500)]
[pragma] ignored -Wunsafe-loop-optimizations // TODO fix

5 years ago[pragma] error -Wclass-memaccess
Behdad Esfahbod [Fri, 18 Jan 2019 00:02:06 +0000 (19:02 -0500)]
[pragma] error -Wclass-memaccess

5 years ago[pragma] More
Behdad Esfahbod [Thu, 17 Jan 2019 23:55:03 +0000 (18:55 -0500)]
[pragma] More

5 years ago[pragma] More
Behdad Esfahbod [Thu, 17 Jan 2019 23:47:32 +0000 (18:47 -0500)]
[pragma] More

5 years ago[pragma] Flesh out more
Behdad Esfahbod [Thu, 17 Jan 2019 23:36:10 +0000 (18:36 -0500)]
[pragma] Flesh out more

5 years agoUse NNOffsetTo<> in rest of places
Behdad Esfahbod [Thu, 17 Jan 2019 23:24:18 +0000 (18:24 -0500)]
Use NNOffsetTo<> in rest of places

5 years agoUse NNOffsetTo<>
Behdad Esfahbod [Thu, 17 Jan 2019 23:17:04 +0000 (18:17 -0500)]
Use NNOffsetTo<>

5 years agoAdd NNOffsetTo<>
Behdad Esfahbod [Thu, 17 Jan 2019 23:10:38 +0000 (18:10 -0500)]
Add NNOffsetTo<>

5 years ago[AAT] Comment
Behdad Esfahbod [Thu, 17 Jan 2019 22:56:27 +0000 (17:56 -0500)]
[AAT] Comment

5 years agoComment
Behdad Esfahbod [Thu, 17 Jan 2019 22:49:55 +0000 (17:49 -0500)]
Comment

5 years ago[AAT] Remove unused code
Behdad Esfahbod [Thu, 17 Jan 2019 22:47:29 +0000 (17:47 -0500)]
[AAT] Remove unused code

5 years ago[AAT] Allow null in ankr lookupTable offset
Behdad Esfahbod [Thu, 17 Jan 2019 22:44:39 +0000 (17:44 -0500)]
[AAT] Allow null in ankr lookupTable offset

5 years ago[pragma GCC] Ignore -Wtype-limits
Behdad Esfahbod [Thu, 17 Jan 2019 22:42:44 +0000 (17:42 -0500)]
[pragma GCC] Ignore -Wtype-limits

5 years ago[ci] Remove -Werror from Travis
Behdad Esfahbod [Thu, 17 Jan 2019 21:07:27 +0000 (16:07 -0500)]
[ci] Remove -Werror from Travis

hb-machinery.hh:111:37: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]

Also ignore -Wtype-limits.

5 years agoMore GCC pragmas
Behdad Esfahbod [Thu, 17 Jan 2019 20:27:31 +0000 (15:27 -0500)]
More GCC pragmas

5 years agoRename macro
Behdad Esfahbod [Thu, 17 Jan 2019 20:22:46 +0000 (15:22 -0500)]
Rename macro

5 years agoAdd more GCC warning pragmas
Behdad Esfahbod [Thu, 17 Jan 2019 20:22:28 +0000 (15:22 -0500)]
Add more GCC warning pragmas

5 years agoMove -Wcast-align to hb.hh
Behdad Esfahbod [Thu, 17 Jan 2019 20:08:36 +0000 (15:08 -0500)]
Move -Wcast-align to hb.hh

5 years agoAdd pragram GCC diagnostic ignored "-Wunused-macros"
Behdad Esfahbod [Thu, 17 Jan 2019 20:04:44 +0000 (15:04 -0500)]
Add pragram GCC diagnostic ignored "-Wunused-macros"

5 years ago[AAT] Fully sanitize ankr table at sanitize time
Behdad Esfahbod [Thu, 17 Jan 2019 19:54:32 +0000 (14:54 -0500)]
[AAT] Fully sanitize ankr table at sanitize time

Third try to fix access. Followup 6879efc2c1596d11a6a6ad296f80063b558d5e0f

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12532
Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=922303

5 years ago[AAT] Fix anchor bound checking, again
Behdad Esfahbod [Thu, 17 Jan 2019 19:06:37 +0000 (14:06 -0500)]
[AAT] Fix anchor bound checking, again

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12532
Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=922303

5 years ago[aat] Minor
Behdad Esfahbod [Thu, 17 Jan 2019 19:06:32 +0000 (14:06 -0500)]
[aat] Minor

5 years agoImprove overflow avoidance
Behdad Esfahbod [Tue, 15 Jan 2019 18:58:19 +0000 (13:58 -0500)]
Improve overflow avoidance

Better fix for 480406cd3ef9e5ab8476ddfa04498bf23906c508
This way we behave the same on 32bit and 64bit archs.

5 years agofix FDSelect fuzzing bug (#1539)
Behdad Esfahbod [Tue, 15 Jan 2019 02:23:17 +0000 (18:23 -0800)]
fix FDSelect fuzzing bug (#1539)

Rewrote struct FDSelect3_4.ranges as ArrayOf
Updated FDSelect3_4::sanitize () to call ranges.sanitize ()
nRanges now a function to return a reference to ranges.len

5 years agoMove _POSIX_SOURCE definition
Behdad Esfahbod [Tue, 15 Jan 2019 01:45:31 +0000 (20:45 -0500)]
Move _POSIX_SOURCE definition

Fixes https://github.com/harfbuzz/harfbuzz/issues/1308

5 years ago[test] Add test for previous commit
Behdad Esfahbod [Mon, 14 Jan 2019 20:31:31 +0000 (15:31 -0500)]
[test] Add test for previous commit

5 years agoFix assertion on address overflow
Behdad Esfahbod [Mon, 14 Jan 2019 20:27:34 +0000 (15:27 -0500)]
Fix assertion on address overflow

Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=917031

5 years ago[AAT] Fix mort ContextualSubtable offset access
Behdad Esfahbod [Mon, 14 Jan 2019 20:09:14 +0000 (15:09 -0500)]
[AAT] Fix mort ContextualSubtable offset access

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12312

5 years ago[AAT] Fix ankr table access
Behdad Esfahbod [Mon, 14 Jan 2019 19:37:36 +0000 (14:37 -0500)]
[AAT] Fix ankr table access

Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=918340

5 years agodeleted a duplicate fontdicts_mod.fini() call (#1538)
Michiharu Ariza [Fri, 11 Jan 2019 23:27:35 +0000 (15:27 -0800)]
deleted a duplicate fontdicts_mod.fini() call (#1538)

5 years agoAdd an initial .clang-format config
Ebrahim Byagowi [Wed, 9 Jan 2019 12:31:11 +0000 (16:01 +0330)]
Add an initial .clang-format config

There are things can be improved on clang-format side I guess before
the full assertion, but is the best we can get for now I guess.

Fixes https://github.com/harfbuzz/harfbuzz/issues/1536

5 years agoMinor, hack .editorconfig for vscode use
Ebrahim Byagowi [Wed, 9 Jan 2019 12:26:32 +0000 (15:56 +0330)]
Minor, hack .editorconfig for vscode use

As VSCode and Atom https://github.com/Microsoft/vscode/issues/44438 don't support it

5 years agofix leak in subset_enc_supp_codes (#1537)
Michiharu Ariza [Tue, 8 Jan 2019 20:37:48 +0000 (12:37 -0800)]
fix leak in subset_enc_supp_codes (#1537)

oss-fuzz issue 12310

5 years ago[ci] Enable more of GCC compile warnings (#1533)
Ebrahim Byagowi [Fri, 4 Jan 2019 19:40:39 +0000 (23:10 +0330)]
[ci] Enable more of GCC compile warnings (#1533)

5 years agoUsermanual: small formatting and wording fixes.
Nathan Willis [Mon, 3 Dec 2018 18:49:44 +0000 (12:49 -0600)]
Usermanual: small formatting and wording fixes.

5 years agoUsermanual: small updates.
Nathan Willis [Wed, 28 Nov 2018 19:48:38 +0000 (13:48 -0600)]
Usermanual: small updates.

5 years agoCircleCI: Test for Python 3 syntax errors and undefined names (#1522)
cclauss [Mon, 31 Dec 2018 03:30:43 +0000 (04:30 +0100)]
CircleCI: Test for Python 3 syntax errors and undefined names (#1522)

Catch missing imports and errors like #1520 and #1521

__E901,E999,F821,F822,F823__ are the "_showstopper_" [flake8](http://flake8.pycqa.org) issues that can halt the runtime with a SyntaxError, NameError, etc. Most other flake8 issues are merely "style violations" -- useful for readability but they do not effect runtime safety.
* F821: undefined name `name`
* F822: undefined name `name` in `__all__`
* F823: local variable name referenced before assignment
* E901: SyntaxError or IndentationError
* E999: SyntaxError -- failed to compile a file into an Abstract Syntax Tree

5 years agoFix automake warnings
Behdad Esfahbod [Sun, 30 Dec 2018 16:27:42 +0000 (11:27 -0500)]
Fix automake warnings

[skip ci]

5 years agoprint() is a function in Python 3 (#1520)
cclauss [Sun, 30 Dec 2018 12:07:28 +0000 (13:07 +0100)]
print() is a function in Python 3 (#1520)

5 years agoPython 3 fixes to gen-os2-unicode-ranges.py (#1521)
cclauss [Sun, 30 Dec 2018 11:58:34 +0000 (12:58 +0100)]
Python 3 fixes to gen-os2-unicode-ranges.py (#1521)

In Python 3, __reload()__ was moved and __sys.setdefaultencoding()__ because the default is already utf-8.  Also __Error()__ is an _undefined name_ and __Exception()__ creates a generic exception.

5 years ago[cmake] Enable C++11 on CMake (#1519)
Ebrahim Byagowi [Sun, 30 Dec 2018 06:53:47 +0000 (10:23 +0330)]
[cmake] Enable C++11 on CMake (#1519)

5 years agoOuch! Fix build on C++<11
Behdad Esfahbod [Sun, 30 Dec 2018 06:53:03 +0000 (01:53 -0500)]
Ouch! Fix build on C++<11

5 years agoFix ubsan with passing nullptr to qsort()
Behdad Esfahbod [Sun, 30 Dec 2018 06:52:19 +0000 (01:52 -0500)]
Fix ubsan with passing nullptr to qsort()

5 years agoFix build on C++ < 11
Behdad Esfahbod [Thu, 27 Dec 2018 23:29:23 +0000 (18:29 -0500)]
Fix build on C++ < 11

5 years ago[vector] Fix warning
Behdad Esfahbod [Thu, 27 Dec 2018 23:27:36 +0000 (18:27 -0500)]
[vector] Fix warning

5 years ago[aat] Minor
Behdad Esfahbod [Thu, 27 Dec 2018 23:27:11 +0000 (18:27 -0500)]
[aat] Minor

5 years ago[vector] Remove use of arrayZ() by using casts
Behdad Esfahbod [Thu, 27 Dec 2018 23:01:06 +0000 (18:01 -0500)]
[vector] Remove use of arrayZ() by using casts

5 years ago[vector] Remove static_array
Behdad Esfahbod [Thu, 27 Dec 2018 22:56:22 +0000 (17:56 -0500)]
[vector] Remove static_array

Was good idea, but with C++ types with constructor/destructor, was getting in
the way as compiler was destructing those items where it was not desired.
Since C++ does not allow zero-sized arrays, just remove it...

5 years ago[vector] Use allocated = -1 to signify failure
Behdad Esfahbod [Thu, 27 Dec 2018 22:45:05 +0000 (17:45 -0500)]
[vector] Use allocated = -1 to signify failure

5 years agofix lealk with cff2::accelerator_templ_t::topDict (#1517)
Michiharu Ariza [Thu, 27 Dec 2018 16:33:09 +0000 (08:33 -0800)]
fix lealk with cff2::accelerator_templ_t::topDict (#1517)

5 years ago[vector] Change pre-alloced count from 8 to 2
Behdad Esfahbod [Mon, 24 Dec 2018 16:31:04 +0000 (11:31 -0500)]
[vector] Change pre-alloced count from 8 to 2

I'm thinking about dropping it to zero, but that needs slight code changes.

5 years agoFix a few warnings
Behdad Esfahbod [Mon, 24 Dec 2018 01:19:52 +0000 (20:19 -0500)]
Fix a few warnings

5 years ago[iter] Fix warning
Behdad Esfahbod [Sat, 22 Dec 2018 21:19:10 +0000 (16:19 -0500)]
[iter] Fix warning

5 years ago[set] Add iter_t as alias to const_iter_t
Behdad Esfahbod [Sat, 22 Dec 2018 21:11:22 +0000 (16:11 -0500)]
[set] Add iter_t as alias to const_iter_t

5 years ago[set] Change to const_iter
Behdad Esfahbod [Sat, 22 Dec 2018 20:10:18 +0000 (15:10 -0500)]
[set] Change to const_iter

5 years ago[set] Cache length in iterator
Behdad Esfahbod [Sat, 22 Dec 2018 16:11:10 +0000 (11:11 -0500)]
[set] Cache length in iterator

5 years agoMinor, remove redundant inline
Ebrahim Byagowi [Sat, 22 Dec 2018 16:17:48 +0000 (19:47 +0330)]
Minor, remove redundant inline

5 years agoMinor, tweak spaces
Ebrahim Byagowi [Sat, 22 Dec 2018 16:17:29 +0000 (19:47 +0330)]
Minor, tweak spaces

5 years agoCFF renaming (#1507)
Michiharu Ariza [Sat, 22 Dec 2018 15:47:04 +0000 (07:47 -0800)]
CFF renaming (#1507)

* reimplement ByteStr as byte_str_t based on hb_ubytes_t

Unuse start_embed<ByteStr>
Also renamed SubByteStr to byte_str_ref_t
More renaming to come

* substr renamed to str_ref in line with its type byte_str_ref_t

* uncamelize non-table struct names

* uncamelized non-struct types OpCode etc

* add byte_str_t copy ctor

* test

* test2

* undo tests

* fix bot failure

* undo the previous change

* fixed tabs, added inline

* Revert "fixed tabs, added inline"

This reverts commit 21163c30e9d18759414f7fe2518628241599f039.

* fix tabs

5 years ago[set] Actually derive iterator from hb_sorted_iter_t<>
Behdad Esfahbod [Sat, 22 Dec 2018 01:07:52 +0000 (20:07 -0500)]
[set] Actually derive iterator from hb_sorted_iter_t<>

5 years ago[set] Implement unified iterator
Behdad Esfahbod [Sat, 22 Dec 2018 01:06:17 +0000 (20:06 -0500)]
[set] Implement unified iterator

5 years ago[set] Mark some internals protected
Behdad Esfahbod [Sat, 22 Dec 2018 01:00:52 +0000 (20:00 -0500)]
[set] Mark some internals protected

5 years ago[iter] Add hb_sorted_iter_t<>
Behdad Esfahbod [Sat, 22 Dec 2018 00:55:02 +0000 (19:55 -0500)]
[iter] Add hb_sorted_iter_t<>

5 years ago[iter] Change operator[] operand to be signed
Behdad Esfahbod [Sat, 22 Dec 2018 00:48:21 +0000 (19:48 -0500)]
[iter] Change operator[] operand to be signed

To fix older compilers again (this was the case in hb_array_t).

hb-ot-layout-common.hh:1353: note: candidate 2: operator[](T*, int) <built-in>
hb-ot-layout-common.hh:1354: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second:
hb-iter.hh:63: note: candidate 1: Item& hb_iter_t<Iter, Item>::operator[](unsigned int) const [with Iter = hb_array_t<const OT::IntType<short unsigned int, 2u> >, Item = const OT::IntType<short unsigned int, 2u>]
hb-ot-layout-common.hh:1354: note: candidate 2: operator[](T*, int) <built-in>
hb-ot-layout-common.hh: In member function 'bool OT::ClassDef::serialize(hb_serialize_context_t*, hb_array_t<const OT::IntType<short unsigned int, 2u> >, hb_array_t<const OT::IntType<short unsigned int, 2u> >)':
hb-ot-layout-common.hh:1490: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second:
hb-iter.hh:63: note: candidate 1: Item& hb_iter_t<Iter, Item>::operator[](unsigned int) const [with Iter = hb_array_t<const OT::IntType<short unsigned int, 2u> >, Item = const OT::IntType<short unsigned int, 2u>]
hb-ot-layout-common.hh:1490: note: candidate 2: operator[](T*, int) <built-in>

5 years ago[array] Port to hb_iter_t<>
Behdad Esfahbod [Sat, 22 Dec 2018 00:29:00 +0000 (19:29 -0500)]
[array] Port to hb_iter_t<>

hb_array_t is its own iterator...

5 years ago[iter] Change __more__ to fallback to __len__
Behdad Esfahbod [Fri, 21 Dec 2018 23:49:27 +0000 (18:49 -0500)]
[iter] Change __more__ to fallback to __len__

5 years ago[array/vector] Rename len to length
Behdad Esfahbod [Fri, 21 Dec 2018 23:46:51 +0000 (18:46 -0500)]
[array/vector] Rename len to length

5 years ago[iter] Split hb_iter_t<> into hb_iter_t<> and hb_iter_mixin_t<>
Behdad Esfahbod [Fri, 21 Dec 2018 23:09:45 +0000 (18:09 -0500)]
[iter] Split hb_iter_t<> into hb_iter_t<> and hb_iter_mixin_t<>

5 years agoAdjust internal header dependencies
Behdad Esfahbod [Fri, 21 Dec 2018 22:35:58 +0000 (17:35 -0500)]
Adjust internal header dependencies

5 years ago[Makefile.am] Minor
Behdad Esfahbod [Fri, 21 Dec 2018 22:29:11 +0000 (17:29 -0500)]
[Makefile.am] Minor

5 years ago[iter] Include from hb.hh
Behdad Esfahbod [Fri, 21 Dec 2018 22:22:09 +0000 (17:22 -0500)]
[iter] Include from hb.hh

5 years ago[iter] Move hb_fill() and hb_copy() to hb-iter.hh
Behdad Esfahbod [Fri, 21 Dec 2018 22:21:19 +0000 (17:21 -0500)]
[iter] Move hb_fill() and hb_copy() to hb-iter.hh

5 years ago[iter] Disallow copy-construction or assignment of hb_iter_t<>
Behdad Esfahbod [Fri, 21 Dec 2018 21:39:57 +0000 (16:39 -0500)]
[iter] Disallow copy-construction or assignment of hb_iter_t<>

Should only be done by subclass.

5 years ago[iter] Fix hb_copy() return value
Behdad Esfahbod [Fri, 21 Dec 2018 21:20:30 +0000 (16:20 -0500)]
[iter] Fix hb_copy() return value

5 years ago[iter] Add const_iter_t / const_iter()
Behdad Esfahbod [Fri, 21 Dec 2018 21:19:44 +0000 (16:19 -0500)]
[iter] Add const_iter_t / const_iter()

5 years ago[iter] Make hb_fill() take collection type, not iter
Behdad Esfahbod [Fri, 21 Dec 2018 21:04:38 +0000 (16:04 -0500)]
[iter] Make hb_fill() take collection type, not iter

Starting to get the hang of when take which.

5 years ago[array] Add more hb_array() / hb_sorted_array() variants
Behdad Esfahbod [Fri, 21 Dec 2018 21:02:16 +0000 (16:02 -0500)]
[array] Add more hb_array() / hb_sorted_array() variants

5 years ago[serialize] Use component_list by reference, as a supplier
Behdad Esfahbod [Fri, 21 Dec 2018 20:56:01 +0000 (15:56 -0500)]
[serialize] Use component_list by reference, as a supplier

5 years ago[iter] Add .random_access()
Behdad Esfahbod [Fri, 21 Dec 2018 20:53:09 +0000 (15:53 -0500)]
[iter] Add .random_access()

5 years ago[iter] Fix __end__()
Behdad Esfahbod [Fri, 21 Dec 2018 20:19:22 +0000 (15:19 -0500)]
[iter] Fix __end__()

5 years ago[array] Remove copy constructor
Behdad Esfahbod [Fri, 21 Dec 2018 20:12:55 +0000 (15:12 -0500)]
[array] Remove copy constructor

Fixes https://github.com/harfbuzz/harfbuzz/issues/1502

5 years agoFix bot
Behdad Esfahbod [Fri, 21 Dec 2018 20:08:06 +0000 (15:08 -0500)]
Fix bot

  C:\projects\harfbuzz\src\hb-uniscribe.cc(709): error C2666: 'hb_vector_t<OPENTYPE_FEATURE_RECORD,8>::operator +': 3 overloads have similar conversions [C:\projects\harfbuzz\build\harfbuzz.vcxproj]

5 years agoMinor
Behdad Esfahbod [Fri, 21 Dec 2018 20:05:00 +0000 (15:05 -0500)]
Minor

5 years ago[iter] Fix test again
Behdad Esfahbod [Fri, 21 Dec 2018 16:20:27 +0000 (11:20 -0500)]
[iter] Fix test again

5 years agoMinor
Behdad Esfahbod [Fri, 21 Dec 2018 16:15:16 +0000 (11:15 -0500)]
Minor

5 years ago[iter] More prototyping
Behdad Esfahbod [Fri, 21 Dec 2018 08:03:46 +0000 (03:03 -0500)]
[iter] More prototyping

5 years ago[iter] Make hb_fill() and hb_copy() take iterators
Behdad Esfahbod [Fri, 21 Dec 2018 07:48:28 +0000 (02:48 -0500)]
[iter] Make hb_fill() and hb_copy() take iterators

I'm still going back and force...

5 years ago[iter] Add hb_fill()
Behdad Esfahbod [Fri, 21 Dec 2018 07:47:04 +0000 (02:47 -0500)]
[iter] Add hb_fill()

5 years ago[iter] Start prototyping hb_copy()
Behdad Esfahbod [Fri, 21 Dec 2018 07:12:55 +0000 (02:12 -0500)]
[iter] Start prototyping hb_copy()

5 years ago[iter] Showcase implicit casts
Behdad Esfahbod [Fri, 21 Dec 2018 06:59:37 +0000 (01:59 -0500)]
[iter] Showcase implicit casts

5 years agoRename
Behdad Esfahbod [Fri, 21 Dec 2018 06:57:40 +0000 (01:57 -0500)]
Rename

5 years ago[iter] Rename
Behdad Esfahbod [Fri, 21 Dec 2018 06:57:02 +0000 (01:57 -0500)]
[iter] Rename

5 years ago[iter] First sample use
Behdad Esfahbod [Fri, 21 Dec 2018 06:53:27 +0000 (01:53 -0500)]
[iter] First sample use

5 years ago[iter] Add bidirectionality
Behdad Esfahbod [Fri, 21 Dec 2018 06:17:35 +0000 (01:17 -0500)]
[iter] Add bidirectionality

5 years ago[iter] Sketch new iterator design
Behdad Esfahbod [Fri, 21 Dec 2018 05:54:55 +0000 (00:54 -0500)]
[iter] Sketch new iterator design

5 years ago[iter] Add empty test
Behdad Esfahbod [Fri, 21 Dec 2018 05:23:34 +0000 (00:23 -0500)]
[iter] Add empty test

5 years agoRevert "Remove unused hb-iter.hh"
Behdad Esfahbod [Fri, 21 Dec 2018 05:08:05 +0000 (00:08 -0500)]
Revert "Remove unused hb-iter.hh"

This reverts commit 969ff3c7aadbe721cdd414488eb170433f10d00c.

5 years ago[vector] Add operator bool
Behdad Esfahbod [Fri, 21 Dec 2018 04:15:49 +0000 (23:15 -0500)]
[vector] Add operator bool

5 years agoRename
Behdad Esfahbod [Fri, 21 Dec 2018 04:14:24 +0000 (23:14 -0500)]
Rename